summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcmdline/apt-key1
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 0 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index e45468fd4..27731ef7d 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -146,6 +146,7 @@ if [ "$1" = "--keyring" ]; then
else
#echo "generate list"
TRUSTEDFILE="/etc/apt/trusted.gpg"
+ eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
if [ -r "$TRUSTEDFILE" ]; then
GPG="$GPG --keyring $TRUSTEDFILE"
fi
diff --git a/debian/changelog b/debian/changelog
index c53c2a468..cc5b03a63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low
that package that was providing some manpages for APT utilities.
[ Julian Andres Klode ]
+ * cmdline/apt-key:
+ - Honor Apt::GPGV::TrustedKeyring (Closes: #316390)
* cmdline/apt-mark:
- Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
* apt-inst/contrib/arfile.h: