cleanup the debian/rules file a bit

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 27731ef7d30a4559d7254c41d7aa620382220d6b..b39ab12e48fd0daf57ec369fdf54b2ee4b6bf386 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -147,11 +147,13 @@ else
        #echo "generate list"
        TRUSTEDFILE="/etc/apt/trusted.gpg"
        eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
        #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