merged from lp:~donkult/apt/sid

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index e45468fd4a1bddaf6407cab9bf4bd4a8fbb71e47..27731ef7d30a4559d7254c41d7aa620382220d6b 100755 (executable)
--- 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"
 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
        if [ -r "$TRUSTEDFILE" ]; then
                GPG="$GPG --keyring $TRUSTEDFILE"
        fi