From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 5 Oct 2011 16:33:44 +0000 (+0200)
Subject: cmdline/apt-key: move ADDED into the right place, thanks to Marc Deslauriers
X-Git-Tag: 0.9.13.exp1ubuntu1~125^2~2^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a57ced3e09b68fa3afda71605a51f87304ca7f5d?ds=sidebyside

cmdline/apt-key: move ADDED into the right place, thanks to Marc Deslauriers
---

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 617fed4f8..cd7824df1 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -51,7 +51,6 @@ add_keys_with_verify_against_master_keyring() {
     add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
     master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5`
     
-    ADDED=0
     for add_key in $add_keys; do
 
         # ensure there are no colisions LP: #857472
@@ -67,6 +66,7 @@ add_keys_with_verify_against_master_keyring() {
         $GPG_CMD --keyring $ADD_KEYRING --export $add_key | $GPG_CMD --keyring $TMP_KEYRING --import --trust-model direct
 
         # check if signed with the master key and only add in this case
+        ADDED=0
 	for master_key in $master_keys; do
 	    if $GPG_CMD --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
 		$GPG --import $TMP_KEYRING