better make_container debugging, message tweaks

git-svn-id: svn://tug.org/texlive/trunk@11693 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 17 insertions, 17 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index a65667f91e0..d67f5f5599a 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1139,11 +1139,11 @@ sub action_update {
   if ($other_updates_asked_for) {
     if (check_for_critical_updates($localtlpdb, $mediatlpdb)) {
       if ($opt_force) {
-        tlwarn("Continuing due to --force\n");
+        tlwarn("$0: Continuing due to --force.\n");
       } elsif ($opt_list) {
         # do not warn here
       } else {
-        die "not continuing, please see warning above!";
+        die "$0: Exiting, please read above warning.\n";
       }
     }
   }
@@ -2313,15 +2313,15 @@ sub check_for_critical_updates
     }
   }
   if ($criticalupdate) {
+    tlwarn("Updates for tlmgr itself are present.\n");
     tlwarn("==========================================================\n");
-    tlwarn("Updates for the tlmgr itself are present.\n");
-    tlwarn("Please update the package bin-texlive and texlive.infra first, ");
+    tlwarn("Please update the package bin-texlive and texlive.infra first,");
     tlwarn("e.g., by calling\n");
-    tlwarn("    tlmgr update bin-texlive texlive.infra\n");
+    tlwarn("  tlmgr update bin-texlive texlive.infra\n");
     tlwarn("Or get the latest updater from\nfor Unix-ish systems:\n");
-    tlwarn("    $TeXLiveURL/update-tlmgr-latest.sh\n");
+    tlwarn("  $TeXLiveURL/update-tlmgr-latest.sh\n");
     tlwarn("for Windows systems:\n");
-    tlwarn("    $TeXLiveURL/update-tlmgr-latest.exe\n");
+    tlwarn("  $TeXLiveURL/update-tlmgr-latest.exe\n");
     tlwarn("Then continue with other updates.\n");
     tlwarn("==========================================================\n");
   }
diff --git a/Master/texmf/scripts/texlive/tlmgr2.pl b/Master/texmf/scripts/texlive/tlmgr2.pl
index 9af143a1c81..69bce3ecfb3 100755
--- a/Master/texmf/scripts/texlive/tlmgr2.pl
+++ b/Master/texmf/scripts/texlive/tlmgr2.pl
@@ -1312,7 +1312,7 @@ sub action_update {
   if ($other_updates_asked_for) {
     if (check_for_critical_updates($localtlpdb, $mediatlpdb)) {
       if ($opts{"force"}) {
-        tlwarn("Continuing due to --force\n");
+        tlwarn("$0: Continuing due to --force.\n");
       } elsif ($opts{"list"}) {
         # do not warn here
       } else {
@@ -1320,7 +1320,7 @@ sub action_update {
           # return here and don't do any updates
           return;
         } else {
-          die "not continuing, please see warning above!";
+          die "$0: Exiting, please read above warning.\n";
         }
       }
     }
@@ -2692,15 +2692,15 @@ sub check_for_critical_updates
     }
   }
   if ($criticalupdate) {
+    tlwarn("Updates for tlmgr itself are present.\n");
     tlwarn("==========================================================\n");
-    tlwarn("Updates for the tlmgr itself are present.\n");
-    tlwarn("Please update the package bin-texlive and texlive.infra first, ");
+    tlwarn("Please update the package bin-texlive and texlive.infra first,");
     tlwarn("e.g., by calling\n");
-    tlwarn("    tlmgr update bin-texlive texlive.infra\n");
+    tlwarn("  tlmgr update bin-texlive texlive.infra\n");
     tlwarn("Or get the latest updater from\nfor Unix-ish systems:\n");
-    tlwarn("    $TeXLiveURL/update-tlmgr-latest.sh\n");
+    tlwarn("  $TeXLiveURL/update-tlmgr-latest.sh\n");
     tlwarn("for Windows systems:\n");
-    tlwarn("    $TeXLiveURL/update-tlmgr-latest.exe\n");
+    tlwarn("  $TeXLiveURL/update-tlmgr-latest.exe\n");
     tlwarn("Then continue with other updates.\n");
     tlwarn("==========================================================\n");
   }
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 7b75b4cd2cc..d36c2b1ea26 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -479,7 +479,7 @@ sub make_container {
   || die "$0: create($tlpobjdir/$self->{'name'}.tlpobj) failed: $!";
   $self->writeout(\*TMP);
   close(TMP);
-  push @files, "$tlpobjdir/$self->{'name'}.tlpobj";
+  push(@files, "$tlpobjdir/$self->{'name'}.tlpobj");
   $tarname = "$containername.tar";
   if ($type eq "tar") {
     $containername = $tarname;
@@ -487,7 +487,7 @@ sub make_container {
     $containername = "$tarname.lzma";
   }
 
-  # start the whole fun
+  # start the fun
   my $tar = $::progs{'tar'};
   my $lzma;
   if (!defined($tar)) {
@@ -517,7 +517,7 @@ sub make_container {
     if (-f $f || -l $f) {
       push(@cmdline, $f);
     } else {
-      tlwarn("$0: (make_container) $_ not a file or directory");
+      tlwarn("$0: (make_container $containername) $f not file or symlink\n");
     }
   }