diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-05-01T18·44+0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-03T09·08+0200 |
| commit | e6c44d166a63abe95a02382386246acea8757951 (patch) | |
| tree | 1b1f5adc9cd5d905b9db674066bf12ddb449b194 | |
| parent | 7391533ea57268a7f0aab433dad41b905e156be6 (diff) | |
Fixing the pv position regarding compression
Problem noticed by niksnut.
| -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 3dcf5cb2d279..41ceabd85847 100644 --- a/perl/lib/Nix/CopyClosure.pm +++ b/perl/lib/Nix/CopyClosure.pm @@ -46,7 +46,7 @@ sub copyTo { if (scalar @missing > 0) { print STDERR "copying ", scalar @missing, " missing paths to ‘$sshHost’...\n"; unless ($dryRun) { - open SSH, "| $compressor $progressViewer ssh $sshHost @{$sshOpts} '$decompressor nix-store --import' > /dev/null" or die; + open SSH, "| $progressViewer $compressor 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 fa7082f327f7..9536ee84d89b 100755 --- a/scripts/nix-copy-closure.in +++ b/scripts/nix-copy-closure.in @@ -121,7 +121,7 @@ else { # Copy FROM the remote machine. $decompressor = "$decompressor |" if $decompressor ne ""; $progressViewer = "$progressViewer -s $missingSize |" if $progressViewer ne ""; my $extraOpts = $sign ? "--sign" : ""; - system("set -f; ssh $sshHost @sshOpts 'nix-store --export $extraOpts @missing $compressor' | $progressViewer $decompressor $Nix::Config::binDir/nix-store --import > /dev/null") == 0 + system("set -f; ssh $sshHost @sshOpts 'nix-store --export $extraOpts @missing $compressor' | $decompressor $progressViewer $Nix::Config::binDir/nix-store --import > /dev/null") == 0 or die "copying store paths from remote machine `$sshHost' failed: $?"; } } |