summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-18 00:29:25 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-18 00:29:25 -0500
commiteff43adce6a763d622fcc254e7cdc210d4573103 (patch)
tree2feb4c03aac92cacb7a37eda9def378bde4ee5a3
parent278c20f82d2ee0954a04b8daae5cbc2788c0015c (diff)
fix some log output
-rwxr-xr-xsrc/monkeysphere-host3
-rw-r--r--src/share/ma/remove_certifier2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 3bee007..c7e011b 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -93,7 +93,8 @@ gpg_host_list() {
# FIXME: should we supress all the edit script spew? or pipe it
# through log debug?
gpg_host_edit() {
- gpg_host --quiet --command-fd 0 --no-tty --edit-key \
+ gpg_host --no-greeting --quiet \
+ --command-fd 0 --no-tty --edit-key \
"0x${HOST_FINGERPRINT}!" "$@" 2>&1 | log debug
}
diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 8271ae0..10aa67b 100644
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -36,7 +36,6 @@ else
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}!"
@@ -44,7 +43,6 @@ if gpg_sphere "--delete-key --batch --yes 0x${keyID}!" ; then
# update the trustdb for the authentication keyring
gpg_sphere "--check-trustdb"
- log info ""
log info "Identity certifier removed."
else
failure "Problem removing identity certifier."