summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLCrypto.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-05-05 02:14:37 +0000
committerNorbert Preining <preining@logic.at>2016-05-05 02:14:37 +0000
commitda1b2d2b56d9d64b11e7a726aa27673af01a6828 (patch)
tree93e177ee519a0adf65b73935b3d39d94f47b0053 /Master/tlpkg/TeXLive/TLCrypto.pm
parentac9392192e3b0c1c6217f2f47abcff3d67b140a8 (diff)
TLCrypto: if TEXMFSYSCONFIG/tlpkg/gpg/keyring.gpg is available, add it to used keyrings
git-svn-id: svn://tug.org/texlive/trunk@40895 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLCrypto.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLCrypto.pm9
1 files changed, 9 insertions, 0 deletions
diff --git a/Master/tlpkg/TeXLive/TLCrypto.pm b/Master/tlpkg/TeXLive/TLCrypto.pm
index ac095bce5b5..ecfb7797dc7 100644
--- a/Master/tlpkg/TeXLive/TLCrypto.pm
+++ b/Master/tlpkg/TeXLive/TLCrypto.pm
@@ -310,6 +310,15 @@ sub setup_gpg {
my $gpghome_quote = "\"$gpghome\"";
# mind the final space for following args
$::gpg = "$prg --homedir $gpghome_quote ";
+ #
+ # check for additional keyrings in
+ # TEXMFSYSCONFIG/tlpkg/gpg/keyring.gpg
+ chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`);
+ my $addkr = "$TEXMFSYSCONFIG/tlpkg/gpg/keyring.gpg";
+ if (-r $addkr) {
+ debug("setup_gpg: using additional keyring $addkr\n");
+ $::gpg .= "--keyring \"$addkr\" ";
+ }
if ($ENV{'TL_GNUPGARGS'}) {
$::gpg .= $ENV{'TL_GNUPGARGS'};
} else {