From 2b4964f31979b5227a7a51b646d2e4bbb5ef6579 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Mar 2012 18:13:44 +0100 Subject: [PATCH] Restore progress indication during nix-copy-closure --- perl/lib/Nix/CopyClosure.pm | 1 - scripts/nix-copy-closure.in | 1 - src/libstore/local-store.cc | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm index 045f6bfaf..7a711766b 100644 --- a/perl/lib/Nix/CopyClosure.pm +++ b/perl/lib/Nix/CopyClosure.pm @@ -33,7 +33,6 @@ sub copyTo { # Export the store paths and import them on the remote machine. if (scalar @missing > 0) { print STDERR "copying ", scalar @missing, " missing paths to ‘$sshHost’...\n"; - #print STDERR " $_\n" foreach @missing; unless ($dryRun) { open SSH, "| $compressor ssh $sshHost @{$sshOpts} '$decompressor nix-store --import'" or die; exportPaths(fileno(SSH), $sign, @missing); diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in index 8bb60e920..b752c272b 100755 --- a/scripts/nix-copy-closure.in +++ b/scripts/nix-copy-closure.in @@ -99,7 +99,6 @@ else { # Copy FROM the remote machine. # Export the store paths on the remote machine and import them locally. if (scalar @missing > 0) { print STDERR "copying ", scalar @missing, " missing paths from ‘$sshHost’...\n"; - #print STDERR " $_\n" foreach @missing; $compressor = "| $compressor" if $compressor ne ""; $decompressor = "$decompressor |" if $decompressor ne ""; unless ($dryRun) { diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index db84cd23c..231640ead 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1276,6 +1276,8 @@ Path LocalStore::importPath(bool requireSignature, Source & source) Path dstPath = readStorePath(hashAndReadSource); + printMsg(lvlInfo, format("importing path `%1%'") % dstPath); + PathSet references = readStorePaths(hashAndReadSource); Path deriver = readString(hashAndReadSource);