nailing-cargo: Message improvements/fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/nailing-cargo b/nailing-cargo
index d6c7e58a893f65aad015fed61e4be6ee20162dca..dbad5b4c874f8456b206313686f1813718df9353 100755 (executable)
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -296,7 +296,7 @@ sub install () {
     }
     rename $use, $mf or die "$self: install nailed $use: $!\n";
     unlink_or_enoent $rm or die "$self: remove old $rm: $!\n";
-    print STDERR "Nailed $mf\n" if $verbose>=3;
+    print STDERR "$self: nailed $mf\n" if $verbose>=3;
   }
 }
 
@@ -371,14 +371,14 @@ $want_uninstall = 1;
 makebackups();
 install();
 
-printf STDERR "$self: Nailed (%d manifests, %d packages)\n",
-  (scalar %manifests, scalar %packagemap)
+printf STDERR "$self: Nailed (%s manifests, %s packages)\n",
+  (scalar keys %manifests), (scalar keys %packagemap)
   if $verbose;
 
 my $estatus = invoke();
 
 uninstall();
 $want_uninstall = 1;
-print STDERR "$self: Unnailed.\n" if $verbose;
+print STDERR "$self: unnailed.\n" if $verbose;
 
 exit $estatus;