* use gpg --with-colons

cmdline/apt-key

@@ -24,10 +24,10 @@ update() {
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
 
     # remove no-longer used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --list-keys|awk '/^pub/{print $2}'`
+    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
     for key in $keys; do
-	if $GPG --list-keys | awk '/^pub/{print $2}'|grep -q $key; then
-	    $GPG --quiet --batch --delete-key --yes "${key#*/}"
+	if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then
+	    $GPG --quiet --batch --delete-key --yes ${key}
 	fi
     done
 }