From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 8 May 2020 12:27:49 +0000 (+0100)
Subject: nailing-cargo: Message improvements/fixes
X-Git-Tag: nailing-cargo/1.0.0~220
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=923a10e5e5b1742a65e77afbf02d9cfd38a86769;p=nailing-cargo.git

nailing-cargo: Message improvements/fixes

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

diff --git a/nailing-cargo b/nailing-cargo
index d6c7e58..dbad5b4 100755
--- 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;