about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2012-03-29T16·58+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-04-13T12·29+0200
commit34a85c5405a228860a7bbe77239fb0204bf6952c (patch)
tree599c02c28182d997e2fe33473b051e508330577e /scripts
parent055e803851e73bb94d341c3b4f25f52be167fef7 (diff)
nix-copy-closure: Move the progressViewer directly adjacent to the ssh call so that network progress is what's measured
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/nix-copy-closure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in
index a38a31a8b5fc..ca240d3ee5f8 100755
--- a/scripts/nix-copy-closure.in
+++ b/scripts/nix-copy-closure.in
@@ -109,7 +109,7 @@ else { # Copy FROM the remote machine.
 	$progressViewer = "$progressViewer |" if $progressViewer ne "";
         unless ($dryRun) {
             my $extraOpts = $sign ? "--sign" : "";
-            system("set -f; ssh $sshHost @sshOpts 'nix-store --export $extraOpts @missing $compressor' | $decompressor $progressViewer $Nix::Config::binDir/nix-store --import > /dev/null") == 0
+            system("set -f; ssh $sshHost @sshOpts 'nix-store --export $extraOpts @missing $compressor' | $progressViewer $decompressor $Nix::Config::binDir/nix-store --import > /dev/null") == 0
                 or die "copying store paths from remote machine `$sshHost' failed: $?";
         }
     }