diff options
| author | Shea Levy <shea@shealevy.com> | 2012-03-29 18:58:14 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-13 14:29:12 +0200 |
| commit | 34a85c5405a228860a7bbe77239fb0204bf6952c (patch) | |
| tree | 599c02c28182d997e2fe33473b051e508330577e | |
| parent | 055e803851e73bb94d341c3b4f25f52be167fef7 (diff) | |
| download | guix-34a85c5405a228860a7bbe77239fb0204bf6952c.tar.gz | |
nix-copy-closure: Move the progressViewer directly adjacent to the ssh call so that network progress is what's measured
| -rw-r--r-- | perl/lib/Nix/CopyClosure.pm | 2 | ||||
| -rwxr-xr-x | scripts/nix-copy-closure.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm index 4794fed9d0..79c6dfcccb 100644 --- a/perl/lib/Nix/CopyClosure.pm +++ b/perl/lib/Nix/CopyClosure.pm @@ -35,7 +35,7 @@ sub copyTo { if (scalar @missing > 0) { print STDERR "copying ", scalar @missing, " missing paths to ‘$sshHost’...\n"; unless ($dryRun) { - open SSH, "| $progressViewer $compressor ssh $sshHost @{$sshOpts} '$decompressor nix-store --import' > /dev/null" or die; + open SSH, "| $compressor $progressViewer ssh $sshHost @{$sshOpts} '$decompressor nix-store --import' > /dev/null" or die; exportPaths(fileno(SSH), $sign, @missing); close SSH or die "copying store paths to remote machine `$sshHost' failed: $?"; } diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in index a38a31a8b5..ca240d3ee5 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: $?"; } } |