about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-10T18·43+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-10T18·43+0200
commit7bb632b02464febd8806ef4bd3fa0ac107f52650 (patch)
tree369be5e1ce1976ac4f8886bbb1c376614600c19e /scripts
parent7c3a5090bff4e9cfe70f1d89619563b55af13d89 (diff)
nix-copy-closure -s: Do substitutions via ‘nix-store --serve’
This means we no longer need an SSH master connection, since we only
execute a single command on the remote host.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/nix-copy-closure.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in
index abd3760fc138..05faa63917da 100755
--- a/scripts/nix-copy-closure.in
+++ b/scripts/nix-copy-closure.in
@@ -81,9 +81,6 @@ while (@ARGV) {
 die "$0: you did not specify a host name\n" unless defined $sshHost;
 
 
-openSSHConnection $sshHost or die "$0: unable to start SSH\n";
-
-
 if ($toMode) { # Copy TO the remote machine.
     Nix::CopyClosure::copyTo(
         $sshHost, [ @sshOpts ], [ @storePaths ], $compressor, $decompressor,
@@ -92,6 +89,8 @@ if ($toMode) { # Copy TO the remote machine.
 
 else { # Copy FROM the remote machine.
 
+    openSSHConnection $sshHost or die "$0: unable to start SSH\n";
+
     # Query the closure of the given store paths on the remote
     # machine.  Paths are assumed to be store paths; there is no
     # resolution (following of symlinks).