X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fma%2Fremove_certifier;h=6c90358bc2c54c6552caa5a91fc0cfa74eaa593e;hb=9847f362471d81b3f13af72f5a28740c94698c20;hp=116416299bd8b6d9144b3aa245aabde3f44ca767;hpb=0655d5cbf24a29da4aff7e272e82bfa258b2ceed;p=monkeysphere.git

diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 1164162..6c90358 100644
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -23,17 +23,19 @@ 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 from the sphere keyring
-# FIXME: should this be a revokation instead of a removal?
 if gpg_sphere "--delete-key --batch --yes 0x${keyID}!" ; then
     # delete key from core keyring as well
     gpg_core --delete-key --batch --yes "0x${keyID}!"
@@ -41,7 +43,7 @@ if gpg_sphere "--delete-key --batch --yes 0x${keyID}!" ; then
     # update the trustdb for the authentication keyring
     gpg_sphere "--check-trustdb"
 
-    log info -e "\nIdentity certifier removed."
+    log info "Identity certifier removed."
 else
     failure "Problem removing identity certifier."
 fi