diff options
| author | Julian Andres Klode <jak@debian.org> | 2010-03-21 17:58:58 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2010-03-21 17:58:58 +0100 |
| commit | 6520109c98500cc1ca6d6b581cc0980531ef8f83 (patch) | |
| tree | 79b65c874206785e78defc9cf504ccb7f623a745 | |
| parent | 8f5525e96777133e18772e398a2bb22ffc497d44 (diff) | |
* cmdline/apt-key:
- Honor Apt::GPGV::TrustedKeyring (Closes: #316390)
| -rwxr-xr-x | cmdline/apt-key | 1 | ||||
| -rw-r--r-- | debian/changelog | 2 |
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: |