summaryrefslogtreecommitdiff
path: root/src/monkeysphere-host
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-17 23:33:55 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-17 23:33:55 -0500
commit278c20f82d2ee0954a04b8daae5cbc2788c0015c (patch)
treed38fb83491979a432d7cade2129d0a831ef8c148 /src/monkeysphere-host
parentad44601e1869bc0bf3ce6ca88a7476379aa3c459 (diff)
parentc1924de73702d0f999a44bc63df9bee0d432636a (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'src/monkeysphere-host')
-rwxr-xr-xsrc/monkeysphere-host7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 11121cc..3bee007 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -80,7 +80,8 @@ gpg_host() {
GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
}
-# command to list the info about the host key, in colon format
+# command to list the info about the host key, in colon format, to
+# stdout
gpg_host_list() {
gpg_host --list-keys --with-colons --fixed-list-mode \
--with-fingerprint --with-fingerprint \
@@ -92,8 +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 --edit-key \
- "0x${HOST_FINGERPRINT}!" "$@"
+ gpg_host --quiet --command-fd 0 --no-tty --edit-key \
+ "0x${HOST_FINGERPRINT}!" "$@" 2>&1 | log debug
}
# export the host public key to the monkeysphere gpg pub key file