summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-10-05 18:33:44 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-10-05 18:33:44 +0200
commita57ced3e09b68fa3afda71605a51f87304ca7f5d (patch)
treea7361b68bd8c2c4f6c2fd2aeafa9e2ae6ed19db5 /cmdline
parentf20750cb30baaf00ca1b87f2ae55e6a0eb900f2b (diff)
cmdline/apt-key: move ADDED into the right place, thanks to Marc Deslauriers
Diffstat (limited to 'cmdline')
-rwxr-xr-xcmdline/apt-key2
1 files changed, 1 insertions, 1 deletions
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