summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-10-05 21:20:00 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-10-05 21:20:00 +0200
commit5f8f6b4eccf04b8f66274297b125a5e4cba6e228 (patch)
tree096b6624faea37da7cc7bbc6c121cbe6ef6efa7f /cmdline
parentd787fe83b74f68dd033e74ce9aeb0120806a17be (diff)
parent27c251b98640130c7d9a3dae6fd66a8a4a22b6d5 (diff)
push local changes
Diffstat (limited to 'cmdline')
-rwxr-xr-xcmdline/apt-key4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 617fed4f8..c522d54fe 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
@@ -64,9 +63,10 @@ add_keys_with_verify_against_master_keyring() {
# export the add keyring one-by-one
rm -f $TMP_KEYRING
- $GPG_CMD --keyring $ADD_KEYRING --export $add_key | $GPG_CMD --keyring $TMP_KEYRING --import --trust-model direct
+ $GPG_CMD --keyring $ADD_KEYRING --export $add_key --output $TMP_KEYRING
# 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