prepare 1.0.9.6

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

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 0ced500db729cdab6939f38888bc671540b21a28..b4e0710006882c72c968dd604f22a6efa4001005 100644 (file)
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -18,7 +18,7 @@ touch $SECRETKEYRING
 GPG_CMD="$GPG_CMD --homedir $GPGHOMEDIR"
 # create the trustdb with an (empty) dummy keyring
 # older gpgs required it, newer gpgs even warn that it isn't needed,
 GPG_CMD="$GPG_CMD --homedir $GPGHOMEDIR"
 # create the trustdb with an (empty) dummy keyring
 # older gpgs required it, newer gpgs even warn that it isn't needed,

-# but require it nontheless for some commands, so we just play safe
+# but require it nonetheless for some commands, so we just play safe

 # here for the foreseeable future and create a dummy one
 $GPG_CMD --quiet --check-trustdb --keyring $SECRETKEYRING >/dev/null 2>&1
 # tell gpg that it shouldn't try to maintain a trustdb file
 # here for the foreseeable future and create a dummy one
 $GPG_CMD --quiet --check-trustdb --keyring $SECRETKEYRING >/dev/null 2>&1
 # tell gpg that it shouldn't try to maintain a trustdb file


@@ -180,14 +180,14 @@ 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
 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
+    if ! $GPG --with-colons --list-keys 2>&1 | grep -q "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]*$2:"; then

        return
     fi
     if [ ! -w "$1" ]; then
        echo >&2 "Key ${2} is in keyring ${1}, but can't be removed as it is read only."
        return
     fi
        return
     fi
     if [ ! -w "$1" ]; then
        echo >&2 "Key ${2} is in keyring ${1}, but can't be removed as it is read only."
        return
     fi

-    # check if it is the only key in the keyring and if so remove the keyring alltogether
+    # check if it is the only key in the keyring and if so remove the keyring altogether

     if [ '1' = "$($GPG --with-colons --list-keys | grep "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]\+:" | wc -l)" ]; then
        mv -f "$1" "${1}~" # behave like gpg
        return
     if [ '1' = "$($GPG --with-colons --list-keys | grep "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]\+:" | wc -l)" ]; then
        mv -f "$1" "${1}~" # behave like gpg
        return