From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Mar 2009 19:02:35 +0000 (-0500)
Subject: normalizing failure invocations in check_gpg_sec_key_id().
X-Git-Tag: monkeysphere_0.24~39
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=183d64eed7eb9724ca6c96f656cb02f475158d0e

normalizing failure invocations in check_gpg_sec_key_id().
---

diff --git a/src/monkeysphere b/src/monkeysphere
index 809b1ac..2d54376 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -86,10 +86,10 @@ check_gpg_sec_key_id() {
 	    echo "$gpgSecOut" | cut -d: -f5
 	    ;;
 	*)
-	    echo "Multiple primary secret keys found:" >&2
-	    echo "$gpgSecOut" | cut -d: -f5 >&2
-	    echo "Please specify which primary key to use." >&2
-	    failure
+	    local seckeys=$(echo "$gpgSecOut" | cut -d: -f5)
+	    failure "Multiple primary secret keys found:
+$seckeys
+Please specify which primary key to use."
 	    ;;
     esac
 }