cleanup the debian/rules file a bit

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 1950723f36db35867a1ca7868d2e47e14b55bcb9..b39ab12e48fd0daf57ec369fdf54b2ee4b6bf386 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -132,7 +132,7 @@ usage() {
 
 # Determine on which keyring we want to work
 if [ "$1" = "--keyring" ]; then
-       echo "keyfile given"
+        #echo "keyfile given"
        shift
        TRUSTEDFILE="$1"
        if [ -r "$TRUSTEDFILE" ]; then
@@ -142,23 +142,27 @@ if [ "$1" = "--keyring" ]; then
                exit 1
        fi
        shift
+# otherwise use the default
 else
-       echo "generate list"
+       #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"
+       eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
        if [ -d "$TRUSTEDPARTS" ]; then
-               echo "parts active"
+               #echo "parts active"
                for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do
-                       echo "part -> $trusted"
+                       #echo "part -> $trusted"
                        GPG="$GPG --keyring $trusted"
                done
        fi
 fi
-echo "COMMAND: $GPG"
+#echo "COMMAND: $GPG"
 
 command="$1"
 if [ -z "$command" ]; then