aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-copy-closure: Move the progressViewer directly adjacent to the ssh call so that network progress is what's measured

Browse source
This commit is contained in:
Shea Levy 2012-03-29 18:58:14 +02:00 committed by Eelco Dolstra
parent 055e803851
commit 34a85c5405
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
perl/lib/Nix/CopyClosure.pm
View file

@ -35,7 +35,7 @@ sub copyTo {
if (scalar @missing > 0) { if (scalar @missing > 0) {
print STDERR "copying ", scalar @missing, " missing paths to ‘$sshHost’...\n"; print STDERR "copying ", scalar @missing, " missing paths to ‘$sshHost’...\n";
unless ($dryRun) { 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); exportPaths(fileno(SSH), $sign, @missing);
close SSH or die "copying store paths to remote machine `$sshHost' failed: $?"; close SSH or die "copying store paths to remote machine `$sshHost' failed: $?";
} }

2
scripts/nix-copy-closure.in
View file

@ -109,7 +109,7 @@ else { # Copy FROM the remote machine.
$progressViewer = "$progressViewer |" if $progressViewer ne ""; $progressViewer = "$progressViewer |" if $progressViewer ne "";
unless ($dryRun) { unless ($dryRun) {
my $extraOpts = $sign ? "--sign" : ""; 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: $?"; or die "copying store paths from remote machine `$sshHost' failed: $?";
} }
} }