projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made gpg_sphere use --quiet again, and now doing more explicit extraction of key...
[monkeysphere.git]
/
src
/
share
/
ma
/
remove_certifier
diff --git
a/src/share/ma/remove_certifier
b/src/share/ma/remove_certifier
index 560281dfc2583e8932b6e07f42bda2682e0323ff..10aa67b1dc820827b5517ba4c8c172292afc79fb 100644
(file)
--- a/
src/share/ma/remove_certifier
+++ b/
src/share/ma/remove_certifier
@@
-23,25
+23,27
@@
if [ -z "$keyID" ] ; then
failure "You must specify the key ID of a key to remove."
fi
failure "You must specify the key ID of a key to remove."
fi
-if gpg_sphere "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-key 0x${keyID}!" ; then
+# FIXME: should we be doing a fancier list_certifier output here?
+gpg_core --list-key --fingerprint "0x${keyID}!" || failure
+
+if [ "$PROMPT" = "true" ] ; then
read -p "Really remove above listed identity certifier? (y/N) " OK; OK=${OK:-N}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "Identity certifier not removed."
fi
else
read -p "Really remove above listed identity certifier? (y/N) " OK; OK=${OK:-N}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "Identity certifier not removed."
fi
else
- failure
+ log debug "certifier removed without prompting."
fi
fi
-# delete the requested key
+# delete the requested key
from the sphere keyring
if gpg_sphere "--delete-key --batch --yes 0x${keyID}!" ; then
if gpg_sphere "--delete-key --batch --yes 0x${keyID}!" ; then
- # delete key from
host
keyring as well
+ # delete key from
core
keyring as well
gpg_core --delete-key --batch --yes "0x${keyID}!"
# update the trustdb for the authentication keyring
gpg_sphere "--check-trustdb"
gpg_core --delete-key --batch --yes "0x${keyID}!"
# update the trustdb for the authentication keyring
gpg_sphere "--check-trustdb"
- echo
- echo "Identity certifier removed."
+ log info "Identity certifier removed."
else
failure "Problem removing identity certifier."
fi
else
failure "Problem removing identity certifier."
fi