From 34a85c5405a228860a7bbe77239fb0204bf6952c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
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

---
 perl/lib/Nix/CopyClosure.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl')

diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm
index 4794fed9d006..79c6dfcccbf4 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: $?";
         }
-- 
cgit 1.4.1