From 2317ae3ac4a37578e8950d38e6cd83da49bbb34e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 May 2020 21:57:54 +0000 Subject: doc,debug git-svn-id: svn://tug.org/texlive/trunk@54993 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 9 +++++---- Master/tlpkg/TeXLive/TLDownload.pm | 2 +- Master/tlpkg/TeXLive/TLPDB.pm | 4 ++-- Master/tlpkg/TeXLive/TLUtils.pm | 21 ++++++++++++--------- 4 files changed, 20 insertions(+), 16 deletions(-) (limited to 'Master') diff --git a/Master/install-tl b/Master/install-tl index 875589cc949..2a385464934 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -2168,12 +2168,13 @@ sub do_install_packages { # 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(); diff --git a/Master/tlpkg/TeXLive/TLDownload.pm b/Master/tlpkg/TeXLive/TLDownload.pm index cf4d1573da1..6eae84d289b 100644 --- a/Master/tlpkg/TeXLive/TLDownload.pm +++ b/Master/tlpkg/TeXLive/TLDownload.pm @@ -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. diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index d5c0f6cb463..e106cc467d0 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -1975,7 +1975,7 @@ sub _install_data { 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 @@ sub _install_data { 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); } } diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index ab1f6c99ddc..6078bfc4e9a 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -2201,9 +2201,11 @@ for newly-downloaded files; see the calls in the C routine 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 @@ sub check_file_and_remove { 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 @@ sub check_file_and_remove { 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); -- cgit v1.2.3