texlive[54993] Master: doc,debug

[commits+karl at tug.org]

Revision: 54993
          http://tug.org/svn/texlive?view=revision&revision=54993
Author:   karl
Date:     2020-05-03 23:57:54 +0200 (Sun, 03 May 2020)
Log Message:
-----------
doc,debug

Modified Paths:
--------------
    trunk/Master/install-tl
    trunk/Master/tlpkg/TeXLive/TLDownload.pm
    trunk/Master/tlpkg/TeXLive/TLPDB.pm
    trunk/Master/tlpkg/TeXLive/TLUtils.pm

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2020-05-03 17:24:24 UTC (rev 54992)
+++ trunk/Master/install-tl	2020-05-03 21:57:54 UTC (rev 54993)
@@ -2168,12 +2168,13 @@
       # only suggest rerunning with the profile if it exists.
       tlwarn("Or you can restart by running the installer with:\n");
       my $repostr = ($opt_location ? " --repository $location" : "");
+      my $args = "--profile $profile_name [YOUR-EXTRA-ARGS]";
       if (win32()) {
-        tlwarn("  install-tl-windows.bat$repostr --profile $profile_name [EXTRA-ARGS]\n"
-          ."or\n"
-          ."  install-tl-advanced.bat$repostr --profile $profile_name [EXTRA-ARGS]\n");
+        tlwarn("  install-tl-windows.bat$repostr $args\n"
+              ."or\n"
+              ."  install-tl-advanced.bat$repostr $args\n");
       } else {
-        tlwarn("  install-tl$repostr --profile $profile_name [EXTRA-ARGS]\n");
+        tlwarn("  install-tl$repostr $args\n");
       }
     }
     flushlog();

Modified: trunk/Master/tlpkg/TeXLive/TLDownload.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLDownload.pm	2020-05-03 17:24:24 UTC (rev 54992)
+++ trunk/Master/tlpkg/TeXLive/TLDownload.pm	2020-05-03 21:57:54 UTC (rev 54993)
@@ -1,6 +1,6 @@
 # $Id$
 # TeXLive::TLDownload.pm - module for abstracting the download modes
-# Copyright 2009-2016 Norbert Preining
+# Copyright 2009-2020 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 

Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm	2020-05-03 17:24:24 UTC (rev 54992)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm	2020-05-03 21:57:54 UTC (rev 54993)
@@ -1975,7 +1975,7 @@
     debug("tlpdb:_install_data: what=$what, target=$target, size=$ww, checksum=$ss, tmpdir=$tempdir\n");
     my ($ret, $pkg) = TeXLive::TLUtils::unpack($what, $target, 'size' => $whatsize, 'checksum' => $whatcheck, 'tmpdir' => $tempdir);
     if (!$ret) {
-      tlwarn("TLPDB::_install_package: $pkg\n");
+      tlwarn("TLPDB::_install_data: $pkg for $what\n"); # $pkg is error msg
       return(0);
     }
     # remove the $pkg.tlpobj, we recreate it anyway again
@@ -1983,7 +1983,7 @@
       if (-r "$target/tlpkg/tlpobj/$pkg.tlpobj");
     return(1);
   } else {
-    tlwarn("TLPDB::_install_package: don't know how to install $what\n");
+    tlwarn("TLPDB::_install_data: don't know how to install $what\n");
     return(0);
   }
 }

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2020-05-03 17:24:24 UTC (rev 54992)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2020-05-03 21:57:54 UTC (rev 54993)
@@ -2201,9 +2201,11 @@
 
 sub check_file_and_remove {
   my ($xzfile, $checksum, $checksize) = @_;
-  debug("check_file $xzfile, $checksum, $checksize\n");
+  my $fn_name = (caller(0))[3];
+  debug("$fn_name $xzfile, $checksum, $checksize\n");
+
   if (!$checksum && !$checksize) {
-    tlwarn("TLUtils::check_file: neither checksum nor checksize " .
+    tlwarn("$fn_name: neither checksum nor checksize " .
            "available for $xzfile, cannot check integrity"); 
     return;
   }
@@ -2218,19 +2220,20 @@
   if ($checksum && ($checksum ne "-1") && $::checksum_method) {
     my $tlchecksum = TeXLive::TLCrypto::tlchecksum($xzfile);
     if ($tlchecksum ne $checksum) {
-      tlwarn("TLUtils::check_file: checksums differ for $xzfile:\n");
-      tlwarn("TLUtils::check_file:   tlchecksum=$tlchecksum, arg=$checksum\n");
+      tlwarn("$fn_name: checksums differ for $xzfile:\n");
+      tlwarn("$fn_name:   tlchecksum=$tlchecksum, arg=$checksum\n");
+      tlwarn("$fn_name: backtrace:\n" . backtrace());
       # on Windows passing a pattern creates the tmpdir in PWD
       # which means that it will be tried to be created on the DVD
       # $check_file_tmpdir = File::Temp::tempdir("tlcheckfileXXXXXXXX");
       $check_file_tmpdir = File::Temp::tempdir();
-      tlwarn("TLUtils::check_file:   removing $xzfile, "
+      tlwarn("$fn_name:   removing $xzfile, "
              . "but saving copy in $check_file_tmpdir\n");
       copy($xzfile, $check_file_tmpdir);
       unlink($xzfile);
       return;
     } else {
-      debug("TLUtils::check_file: checksums for $xzfile agree\n");
+      debug("$fn_name: checksums for $xzfile agree\n");
       # if we have checked the checksum, we don't need to check the size, too
       return;
     }
@@ -2238,13 +2241,13 @@
   if ($checksize && ($checksize ne "-1")) {
     my $filesize = (stat $xzfile)[7];
     if ($filesize != $checksize) {
-      tlwarn("TLUtils::check_file: removing $xzfile, sizes differ:\n");
-      tlwarn("TLUtils::check_file:   tlfilesize=$filesize, arg=$checksize\n");
+      tlwarn("$fn_name: removing $xzfile, sizes differ:\n");
+      tlwarn("$fn_name:   tlfilesize=$filesize, arg=$checksize\n");
       if (!defined($check_file_tmpdir)) {
         # the tmpdir should always be undefined, since we shouldn't get
         # here if the checksums failed, but test anyway.
         $check_file_tmpdir = File::Temp::tempdir("tlcheckfileXXXXXXXX");
-        tlwarn("TLUtils::check_file:  saving copy in $check_file_tmpdir\n");
+        tlwarn("$fn_name:  saving copy in $check_file_tmpdir\n");
         copy($xzfile, $check_file_tmpdir);
       }
       unlink($xzfile);