X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fma%2Fremove_certifier;h=6c90358bc2c54c6552caa5a91fc0cfa74eaa593e;hb=cd4c36070c85283086ed914d8fd6ac77884173bb;hp=560281dfc2583e8932b6e07f42bda2682e0323ff;hpb=666062a6c5e14ac3e54a405d9a52ef3208ff649e;p=monkeysphere.git

diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 560281d..6c90358 100644
--- 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
 
-if gpg_sphere "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-key 0x${keyID}!" ; then
-    read -p "Really remove above listed identity certifier? (y/N) " OK; OK=${OK:-N}
+# 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 the above listed identity certifier? (Y/n) " OK; OK=${OK:-Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "Identity certifier not removed."
     fi
 else
-    failure
+    log debug "certifier removed without prompting."
 fi
 
-# delete the requested key
+# delete the requested key from the sphere keyring
 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"
 
-    echo
-    echo "Identity certifier removed."
+    log info "Identity certifier removed."
 else
     failure "Problem removing identity certifier."
 fi