diff options
Diffstat (limited to 'Master/tlpkg')
-rw-r--r-- | Master/tlpkg/TeXLive/TLCrypto.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLCrypto.pm b/Master/tlpkg/TeXLive/TLCrypto.pm index f604b2b4f39..ed61a663d56 100644 --- a/Master/tlpkg/TeXLive/TLCrypto.pm +++ b/Master/tlpkg/TeXLive/TLCrypto.pm @@ -311,13 +311,15 @@ sub setup_gpg { # 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"; + # check for additional keyring + # originally we wanted to use TEXMFSYSCONFIG, but gnupg on Windows + # is so stupid that it *prepends* GNUPGHOME to paths starting with + # a drive letter like c:/ + # Thus we switch to using repository-keys.gpg in GNUPGHOME! + my $addkr = "$gpghome/repository-keys.gpg"; if (-r $addkr) { debug("setup_gpg: using additional keyring $addkr\n"); - $::gpg .= "--keyring \"$addkr\" "; + $::gpg .= "--keyring repository-keys.gpg "; } if ($ENV{'TL_GNUPGARGS'}) { $::gpg .= $ENV{'TL_GNUPGARGS'}; |