From da1b2d2b56d9d64b11e7a726aa27673af01a6828 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 5 May 2016 02:14:37 +0000 Subject: 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 --- Master/tlpkg/TeXLive/TLCrypto.pm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Master/tlpkg/TeXLive/TLCrypto.pm') 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 { -- cgit v1.2.3