nailing-cargo: message and debug improvements

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

diff --git a/nailing-cargo b/nailing-cargo
index 0997cdc1e2ddb401560fb4ec5aebb8c3a39f8ca7..327b25282addccbb70c5990c5719c1815f10ba82 100755 (executable)
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -372,11 +372,14 @@ END
     } @ARGV;
     @command = @_, "set -${xe}; $pre $quoted; $post";
   };
+  print STDERR "$self: out-of-tree, building in: \`$build_absdir'\n"
+    if $verbose;
   if ($use eq 'really') {
     my $user = $getuser->();
     my @pw = getpwnam $user or die "$self: oot.user \`$user' lookup failed\n";
     my $homedir = $pw[7];
     $sh_ec->('really','-u',$user,'env',"HOME=$homedir");
+    print STDERR "$self: using really to run as user \`$user'\n" if $verbose;
   } elsif ($use eq 'ssh') {
     my $user = $getuser->();
     $user .= '@localhost' unless $user =~ m/\@/;
@@ -508,7 +511,14 @@ calculate_oot();
 if ($dump) {
   eval '
     use Data::Dumper;
-    print STDERR Dumper(\%manifests, \%packagemap, \@ARGV);
+    print STDERR Dumper(\%manifests) if $dump>=2;
+    print STDERR Dumper(\%packagemap, \@ARGV,
+                        { src_absdir => $src_absdir,
+                          worksphere => $worksphere,
+                          subdir => $subdir,
+                          oot_dir => $oot_dir,
+                          oot_absdir => $oot_absdir,
+                          build_absdir => $build_absdir });
   ' or die $@;
 }
 
@@ -518,10 +528,11 @@ $want_uninstall = 1;
 makebackups();
 install();
 
-printf STDERR "$self: Nailed (%s manifests, %s packages)\n",
+printf STDERR "$self: nailed (%s manifests, %s packages)\n",
   (scalar keys %manifests), (scalar keys %packagemap)
   if $verbose;
 
+print STDERR "$self: invoking: @display_cmd\n" if $verbose;
 my $estatus = invoke();
 
 uninstall();