summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-02-08 14:13:13 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-02-08 14:13:13 +0100
commitfe32e82bce354ffd2832acb39c253f90a9ffb5b9 (patch)
tree2d7a233e7e5599987f9548cadfde73954330e192 /cmdline
parent1b7fe0e12c7553e0efc90ca6922caecb8d5cbb07 (diff)
parent87123e9d81225376f089b0172d0689c1b0413f4f (diff)
merged from apt--mvo
Diffstat (limited to 'cmdline')
-rwxr-xr-xcmdline/apt-key7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 860895ae2..e2dbd8af7 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -34,11 +34,16 @@ 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`
for add_key in $add_keys; do
+ ADDED=0
for master_key in $master_keys; do
- if $GPG --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
+ 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
+ ADDED=1
fi
done
+ if [ $ADDED = 0 ]; then
+ echo >&2 "Key '$add_key' not added. It is not signed with a master key"
+ fi
done
}