summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/tlpkg/TeXLive/TLCrypto.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/Master/tlpkg/TeXLive/TLCrypto.pm b/Master/tlpkg/TeXLive/TLCrypto.pm
index 4554da030a9..76511df521e 100644
--- a/Master/tlpkg/TeXLive/TLCrypto.pm
+++ b/Master/tlpkg/TeXLive/TLCrypto.pm
@@ -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);