projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jrollins/master'
[monkeysphere.git]
/
src
/
share
/
ma
/
remove_certifier
diff --git
a/src/share/ma/remove_certifier
b/src/share/ma/remove_certifier
index 4e56264d695f5140ff2fb11bc4f8eb730bc0110c..8271ae0d670f5b12bb253a981f2348b82e40cb2b 100644
(file)
--- a/
src/share/ma/remove_certifier
+++ b/
src/share/ma/remove_certifier
@@
-23,13
+23,16
@@
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 "--list-key --fingerprint 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
# delete the requested key from the sphere keyring
fi
# delete the requested key from the sphere keyring