From 598dc9ed327598a3377784d2aead0c8e240e855e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Sep 2019 18:04:33 +0000 Subject: (tlchecksum): identify ourselves more specifically in tlwarn/tldie messages. git-svn-id: svn://tug.org/texlive/trunk@52158 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLCrypto.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Master/tlpkg/TeXLive/TLCrypto.pm') diff --git a/Master/tlpkg/TeXLive/TLCrypto.pm b/Master/tlpkg/TeXLive/TLCrypto.pm index a5d3c3f62f9..4db22b7f26d 100644 --- a/Master/tlpkg/TeXLive/TLCrypto.pm +++ b/Master/tlpkg/TeXLive/TLCrypto.pm @@ -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 ""; } } -- cgit v1.2.3