diff options
author | Norbert Preining <norbert@preining.info> | 2019-09-24 03:00:39 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-09-24 03:00:39 +0000 |
commit | 94c2e367c3690be2a3c715b4577c81200652ad81 (patch) | |
tree | 99f33eec6cc7707f418eb005b7cd93d115cecb18 /systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm | |
parent | da6f3bd15942a19bc893c478d3afe97b6d13b954 (diff) |
CTAN sync 201909240300
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm')
-rw-r--r-- | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm index 293d9555b9..3e4dfb1331 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm @@ -1,4 +1,4 @@ -# $Id: TLCrypto.pm 51838 2019-08-07 21:53:30Z karl $ +# $Id: TLCrypto.pm 52158 2019-09-23 18:04:33Z karl $ # TeXLive::TLCrypto.pm - handle checksums and signatures. # Copyright 2016-2019 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -12,7 +12,7 @@ use TeXLive::TLConfig; use TeXLive::TLUtils qw(debug ddebug win32 which platform conv_to_w32_path tlwarn tldie); -my $svnrev = '$Revision: 51838 $'; +my $svnrev = '$Revision: 52158 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -148,7 +148,9 @@ sub tlchecksum { if (!$::checksum_method) { setup_checksum_method(); } - tldie("no checksum method available\n") if (!$::checksum_method); + tldie("TLCRYPTO::tlchecksum: no checksum method available\n") + if (!$::checksum_method); + if (-r $file) { my ($out, $ret); if ($::checksum_method eq "openssl") { @@ -167,10 +169,10 @@ sub tlchecksum { close(FILE); $ret = 0; } else { - tldie("unknown checksum program: $::checksum_method\n"); + tldie("TLCRYPTO::tlchecksum: unknown checksum program: $::checksum_method\n"); } if ($ret != 0) { - tlwarn("tlchecksum: cannot compute checksum: $file\n"); + tlwarn("TLCRYPTO::tlchecksum: cannot compute checksum: $file\n"); return ""; } ddebug("tlchecksum: out = $out\n"); @@ -186,12 +188,13 @@ sub tlchecksum { } debug("tlchecksum($file): ===$cs===\n"); if (length($cs) != 128) { - tlwarn("unexpected output from $::checksum_method: $out\n"); + tlwarn("TLCRYPTO::tlchecksum: unexpected output from $::checksum_method:" + . " $out\n"); return ""; } return $cs; } else { - tlwarn("tlchecksum: given file not readable: $file\n"); + tlwarn("TLCRYPTO::tlchecksum: given file not readable: $file\n"); return ""; } } |