diff options
| author | Matt Goins <mjgoins@openflows.com> | 2009-02-17 22:31:17 -0500 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2009-02-17 22:31:17 -0500 |
| commit | 8e3de9de8bc67b3e9e2c490a7e3142fde7742044 (patch) | |
| tree | d0cb80bf0d37da795721167ecbf42423a570f578 /src/share/ma/remove_certifier | |
| parent | 3b81cd012e8224490a3836cccbd7d082a061658e (diff) | |
| parent | 25e870d1d7109f9e37460c26de4a05a05adfc760 (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/share/ma/remove_certifier')
| -rw-r--r-- | src/share/ma/remove_certifier | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier index 1164162..8271ae0 100644 --- 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 -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 - failure + log debug "certifier removed without prompting." fi # delete the requested key from the sphere keyring @@ -41,7 +44,8 @@ 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 "" + log info "Identity certifier removed." else failure "Problem removing identity certifier." fi |