diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2010-05-06 13:02:40 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2010-05-06 13:02:40 -0400 |
| commit | c74075ae34bf6dd035f42ce044046e6f273ae73d (patch) | |
| tree | 2c49123c015b47c010ebfb5852e36cbe24a2eebb | |
| parent | e6a41995792ee8b7a3dbce1e763e40447e45755f (diff) | |
do not fail or bail when admin interactively declines to publish a key with m-h
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | src/share/mh/publish_key | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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." |