From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 6 May 2010 17:02:40 +0000 (-0400)
Subject: do not fail or bail when admin interactively declines to publish a key with m-h
X-Git-Tag: monkeysphere_0.31~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c74075ae34bf6dd035f42ce044046e6f273ae73d;p=monkeysphere.git

do not fail or bail when admin interactively declines to publish a key with m-h
---

diff --git a/Changelog b/Changelog
index d03062e..d6a7a56 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,8 @@ monkeysphere (0.31~pre) UNRELEASED; urgency=low
 
   * support x509 anchors for monkeysphere-host, allow shared anchor
     between m-h and m-a (closes MS #2288)
+  * do not bail or fail on m-h publish-key if the admin interactively
+    declines to publish one of the keys key (closes MS #1945)
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 06 May 2010 11:23:38 -0400
 
diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key
index 72d2693..52c8b86 100644
--- a/src/share/mh/publish_key
+++ b/src/share/mh/publish_key
@@ -22,7 +22,8 @@ if [ "$PROMPT" != "false" ] ; then
     printf "Really publish key '$keyID' to $KEYSERVER? (Y/n) " >&2
     read OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
-	failure "key not published."
+	log error "key not published."
+        return
     fi
 else
     log debug "publishing key '$keyID' without prompting."