apt-key del: Ignore case when checking if a keyid exists in a keyring.

[ntk/apt.git] / cmdline / apt-key.in

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index b4e0710..751cc5c 100644 (file)
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -180,8 +180,8 @@ update() {
 remove_key_from_keyring() {
     local GPG="$GPG_CMD --keyring $1"
     # check if the key is in this keyring: the key id is in the 5 column at the end
-    if ! $GPG --with-colons --list-keys 2>&1 | grep -q "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]*$2:"; then
-       return
+    if ! $GPG --with-colons --list-keys 2>&1 | grep -qi "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]*$2:"; then
+       return 1
     fi
     if [ ! -w "$1" ]; then
        echo >&2 "Key ${2} is in keyring ${1}, but can't be removed as it is read only."
@@ -211,23 +211,35 @@ remove_key_from_keyring() {
 remove_key() {
     requires_root
 
+    local NOTFOUND=1
+    local RET=0
     # if a --keyring was given, just remove from there
     if [ -n "$FORCED_KEYRING" ]; then
-       remove_key_from_keyring "$FORCED_KEYRING" "$1"
+       remove_key_from_keyring "$FORCED_KEYRING" "$1" || RET=$?
+       NOTFOUND=$RET
     else
        # otherwise all known keyrings are up for inspection
        local TRUSTEDFILE="/etc/apt/trusted.gpg"
        eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
        eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
-       remove_key_from_keyring "$TRUSTEDFILE" "$1"
+       remove_key_from_keyring "$TRUSTEDFILE" "$1" || RET=$?
+       NOTFOUND=$RET
        TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
        eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
        if [ -d "$TRUSTEDPARTS" ]; then
            for trusted in $(run-parts --list "$TRUSTEDPARTS" --regex '^.*\.gpg$'); do
-               remove_key_from_keyring "$trusted" "$1"
+               RET=0
+               remove_key_from_keyring "$trusted" "$1" || RET=$?
+               if [ $RET -eq 0 ]; then
+                   NOTFOUND=0
+               fi
            done
        fi
     fi
+    if [ $NOTFOUND -ne 0 ]; then
+       echo >&2 "ERROR: The specified keyid '$1' was not found"
+       return 1
+    fi
     echo "OK"
 }