* Applied patch from Guillem Jover <guillem.jover@nokia.com> to add

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7460a24be0b5b345942ce4a3bec06c3d71356e0e..90ecae2cf543440ae5e93e070254c0f4372b1356 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -24,9 +24,9 @@ update() {
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
 
     # remove no-longer used keys
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
 
     # remove no-longer used keys

-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
+    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`

     for key in $keys; do
     for key in $keys; do

-       if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then
+       if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then

            $GPG --quiet --batch --delete-key --yes ${key}
        fi
     done
            $GPG --quiet --batch --delete-key --yes ${key}
        fi
     done