ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

Merge pull request #17 from jasonrm/nix-copy-ssh-options

Browse source 
Makes SSH options available to nix-copy-closure
This commit is contained in:
Zhaofeng Li 2021-03-14 23:06:04 -07:00 committed by GitHub
commit 180d2f2435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nix/host/ssh.rs
View file

@ -147,6 +147,9 @@ impl Ssh {
} }
fn nix_copy_closure(&self, path: &StorePath, direction: CopyDirection, options: CopyOptions) -> Command { fn nix_copy_closure(&self, path: &StorePath, direction: CopyDirection, options: CopyOptions) -> Command {
let ssh_options = self.ssh_options();
let ssh_options_str = ssh_options.join(" ");
let mut command = Command::new("nix-copy-closure"); let mut command = Command::new("nix-copy-closure");
match direction { match direction {
CopyDirection::ToRemote => { CopyDirection::ToRemote => {
@ -170,7 +173,8 @@ impl Ssh {
command command
.arg(&self.ssh_target()) .arg(&self.ssh_target())
.arg(path.as_path()); .arg(path.as_path())
.env("NIX_SSHOPTS", ssh_options_str);
command command
} }