From 34a85c5405a228860a7bbe77239fb0204bf6952c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 29 Mar 2012 18:58:14 +0200 Subject: nix-copy-closure: Move the progressViewer directly adjacent to the ssh call so that network progress is what's measured --- scripts/nix-copy-closure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/nix-copy-closure.in') diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in index a38a31a8b..ca240d3ee 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: $?"; } } -- cgit v1.2.3