From 733d920b94909b19022276f7288b70afa14713bd Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 14 Mar 2010 10:07:46 -0400
Subject: cleaning up monkeysphere-host show-key output

---
 src/monkeysphere-host | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/monkeysphere-host')

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 12e7bad..d615230 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -268,7 +268,7 @@ multi_key() {
 
     for key in $keys ; do
 	if (( i++ > 0 )) ; then
-	    echo "##############################"
+	    printf "\n"
 	fi
 	"$cmd" "$key"
     done
@@ -309,8 +309,9 @@ show_key() {
     # FIXME: make no-show-keyring work so we don't have to do the grep'ing
     # FIXME: can we show uid validity somehow?
     gpg --list-keys --list-options show-unusable-uids "$fingerprint" 2>/dev/null \
-	| grep -v "^${GNUPGHOME}/pubring.gpg$" \
-	| egrep -v '^-+$'
+        | grep -v "^${GNUPGHOME}/pubring.gpg$" \
+        | egrep -v '^-+$' \
+        | grep -v '^$'
 
     # list revokers, if there are any
     revokers=$(gpg --list-keys --with-colons --fixed-list-mode "$fingerprint" \
@@ -320,7 +321,6 @@ show_key() {
 	for key in $revokers ; do
 	    echo "revoker: $key"
 	done
-	echo
     fi
 
     # list the pgp fingerprint
-- 
cgit v1.2.3


From 42f7fec024d11c2ff20299f73254eda5b06ed181 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 14 Mar 2010 10:21:31 -0400
Subject: fixing an error message in monkeysphere-host

---
 src/monkeysphere-host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/monkeysphere-host')

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index d615230..f5374bd 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -239,7 +239,7 @@ prompt_userid_exists() {
     if gpgOut=$(gpg_host_list_keys "=${userID}" 2>/dev/null) ; then
 	fingerprint=$(echo "$gpgOut" | grep '^fpr:' | cut -d: -f10)
 	if [ "$PROMPT" != "false" ] ; then
-	    printf "Service name '%s' is already being used by key '%s'.\nAre you sure you want to use it again? (y/N) " "$fingerprint" "$userID" >&2
+	    printf "Service name '%s' is already being used by key '%s'.\nAre you sure you want to use it again? (y/N) " "$userID" "$fingerprint" >&2
 	    read OK; OK=${OK:=N}
 	    if [ "${OK/y/Y}" != 'Y' ] ; then
 		failure "Service name not added."
-- 
cgit v1.2.3


From 39d013c4d307d6a844f8dc2deabf42adc0a8a388 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 14 Mar 2010 10:46:18 -0400
Subject: avoid checking trustdb from monkeysphere-host (Closes: MS #1957)

---
 src/monkeysphere-host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/monkeysphere-host')

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index f5374bd..2c19331 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -74,7 +74,7 @@ EOF
 
 # function to interact with the gpg keyring
 gpg_host() {
-    GNUPGHOME="$GNUPGHOME_HOST" gpg --no-greeting --quiet --no-tty "$@"
+    GNUPGHOME="$GNUPGHOME_HOST" gpg --no-auto-check-trust-db --no-greeting --quiet --no-tty "$@"
 }
 
 # list the info about the a key, in colon format, to stdout
-- 
cgit v1.2.3


From 3d46f5954da2bc9a2dd8d2ce35713136149c2983 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 14 Mar 2010 16:09:42 -0400
Subject: fix typo

---
 src/monkeysphere-host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/monkeysphere-host')

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 2c19331..a5db8c1 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -74,7 +74,7 @@ EOF
 
 # function to interact with the gpg keyring
 gpg_host() {
-    GNUPGHOME="$GNUPGHOME_HOST" gpg --no-auto-check-trust-db --no-greeting --quiet --no-tty "$@"
+    GNUPGHOME="$GNUPGHOME_HOST" gpg --no-auto-check-trustdb --no-greeting --quiet --no-tty "$@"
 }
 
 # list the info about the a key, in colon format, to stdout
-- 
cgit v1.2.3