summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-04-11 03:09:12 +0000
committerNorbert Preining <norbert@preining.info>2020-04-11 03:09:12 +0000
commitc2697fc286a1e2c94fd9968b76be6f4a6d2114cd (patch)
tree1dc2cfb07cb032740483dd8be7c74aff66b70352 /systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
parent25111608e6aa05042b0c6f83009262e1973d7a45 (diff)
CTAN sync 202004110309
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm')
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
index fbd7d1c7a4..5ce0e3632e 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
@@ -1,4 +1,4 @@
-# $Id: TLCrypto.pm 53853 2020-02-21 08:39:42Z preining $
+# $Id: TLCrypto.pm 54064 2020-03-04 01:25:36Z preining $
# TeXLive::TLCrypto.pm - handle checksums and signatures.
# Copyright 2016-2020 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: 53853 $';
+my $svnrev = '$Revision: 54064 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -595,9 +595,12 @@ sub gpg_verify_signature {
debug("verification succeeded, output:\n$out\n");
return ($VS_VERIFIED, $out);
} else {
- if (grep(/^\[GNUPG:\] NO_PUBKEY (.*)/, @status_lines)) {
- debug("missing pubkey $1\n");
- return ($VS_PUBKEY_MISSING, "missing pubkey $1");
+ my @nopb = grep(/^\[GNUPG:\] NO_PUBKEY /, @status_lines);
+ if (@nopb) {
+ my $mpk = $nopb[-1];
+ $mpk =~ s/^\[GNUPG:\] NO_PUBKEY //;
+ debug("missing pubkey $mpk\n");
+ return ($VS_PUBKEY_MISSING, "missing pubkey $mpk");
}
# we could do more checks on what is the actual problem here!
return ($VS_SIGNATURE_ERROR, $out);