summaryrefslogtreecommitdiff
path: root/cmdline/apt-key
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2009-08-28 12:03:39 +0200
committerLoïc Minier <lool@dooz.org>2009-08-28 12:03:39 +0200
commita69a3a044be84f72508fb468cdf13d9e5f724dd4 (patch)
tree3633f865853cd3fe425dab97289adece4f4319b2 /cmdline/apt-key
parentf408836a80f20359c87d8815608af651199e3d73 (diff)
* cmdline/apt-key:
- Emit a warning if removed keys keyring is missing and skip associated checks (LP: #218971)
Diffstat (limited to 'cmdline/apt-key')
-rwxr-xr-xcmdline/apt-key18
1 files changed, 11 insertions, 7 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 26aa55633..b579e5a53 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -90,13 +90,17 @@ update() {
# add any security. we *need* this check on net-update though
$GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
- # remove no-longer supported/used keys
- keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
- for key in $keys; do
- if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
- $GPG --quiet --batch --delete-key --yes ${key}
- fi
- done
+ if [ -r "$REMOVED_KEYS" ]; then
+ # remove no-longer supported/used keys
+ keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
+ for key in $keys; do
+ if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
+ $GPG --quiet --batch --delete-key --yes ${key}
+ fi
+ done
+ else
+ echo "Warning: removed keys keyring $REMOVED_KEYS missing or not readable" >&2
+ fi
}