X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c24f6ce22cd6720004addad2e3382b3caa6b1b7c..2a679f4f71784800b6643b5c4eecb4b11865a439:/cmdline/apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 1950723f3..27731ef7d 100755
--- 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,25 @@ 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)
 	if [ -r "$TRUSTEDFILE" ]; then
 		GPG="$GPG --keyring $TRUSTEDFILE"
 	fi
 	GPG="$GPG --primary-keyring $TRUSTEDFILE"
 	TRUSTEDPARTS="/etc/apt/trusted.gpg.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