From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Feb 2008 10:15:54 +0000 (+0100)
Subject: cmdline/apt-key: import from the correct keyring (ADD_KEYRING) in add_keys_with_verif... 
X-Git-Tag: 0.7.24ubuntu1~91^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3916f941154e6b98f69730688efeb8df217ce44a?ds=inline

cmdline/apt-key: import from the correct keyring (ADD_KEYRING) in add_keys_with_verify_against_master_keyring
---

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 5791f33c0..bbf3a7697 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -41,7 +41,7 @@ add_keys_with_verify_against_master_keyring() {
 	ADDED=0
 	for master_key in $master_keys; do
 	    if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
-		$GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import
+		$GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import
 		ADDED=1
 	    fi
 	done