]> git.saurik.com Git - apt.git/blobdiff - cmdline/apt-key
* debian/apt.conf.autoremove:
[apt.git] / cmdline / apt-key
index e45468fd4a1bddaf6407cab9bf4bd4a8fbb71e47..b39ab12e48fd0daf57ec369fdf54b2ee4b6bf386 100755 (executable)
@@ -146,11 +146,14 @@ 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)
+       eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
        if [ -r "$TRUSTEDFILE" ]; then
                GPG="$GPG --keyring $TRUSTEDFILE"
        fi
        GPG="$GPG --primary-keyring $TRUSTEDFILE"
        TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
        if [ -r "$TRUSTEDFILE" ]; then
                GPG="$GPG --keyring $TRUSTEDFILE"
        fi
        GPG="$GPG --primary-keyring $TRUSTEDFILE"
        TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
+       eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
        if [ -d "$TRUSTEDPARTS" ]; then
                #echo "parts active"
                for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do
        if [ -d "$TRUSTEDPARTS" ]; then
                #echo "parts active"
                for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do