normalizing failure invocations in check_gpg_sec_key_id().
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Mar 2009 19:02:35 +0000 (14:02 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Mar 2009 19:02:35 +0000 (14:02 -0500)
src/monkeysphere

index 809b1ac9f897260d95ba1f3e4c79398cc68188d9..2d543765fdfbc01c1d46a8f313352676a942707e 100755 (executable)
@@ -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
 }