* cmdline/apt-key:

  - Emit a warning if removed keys keyring is missing and skip associated
    checks (LP: #218971)

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 26aa55633c148545f0f121777cc86b43e4e61ddb..b579e5a53c94aeae1928bfeecba103f9729445ef 100755 (executable)
--- 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
 }
 
 

diff --git a/debian/changelog b/debian/changelog
index dbd8fe5b3d4f2d5ab17a12c117e360f020786272..160210dac95f929c8fd04b00044c54719fbfccc4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,11 @@ apt (0.7.22.3) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
     - typo fix (LP: #370094)
 
+  [ Loïc Minier ]
+  * cmdline/apt-key:
+    - Emit a warning if removed keys keyring is missing and skip associated
+      checks (LP: #218971)
+
  -- Michael Vogt <mvo@debian.org>  Wed, 19 Aug 2009 11:14:15 +0200
 
 apt (0.7.22.2) unstable; urgency=low