made monkeysphere --gen-subkey work better for users without gpg keys.

diff --git a/debian/changelog b/debian/changelog
index f7bf5f08a84961469398c4248978bb27a746cd45..f6b69f810aac8eb00c3e524198d210fd864aebb6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low
   * debian/control: switched Vcs-Git to use "centralized" git repo instead
     of my own.
   * More monkeysphere-server diagnostics
+  * monkeysphere --gen-subkey now guesses what KeyID you meant.
 
  -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Thu, 07 Aug 2008 13:31:14 -0400
 

diff --git a/src/monkeysphere b/src/monkeysphere
index 4a611c806e4ea8dd3d4405a643821b543d0aef44..8ddfe7fdc93513d5552c93f40407206777f85825 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -101,6 +101,11 @@ gen_subkey(){
     else
        keyID="$1"
     fi
+    if [ -z "$keyID" ] ; then
+       failure "You have no secret key available.  You should create an OpenPGP
+key before joining the monkeysphere. You can do this with:
+   gpg --gen-key"
+    fi
 
     # get key output, and fail if not found
     gpgOut=$(gpg --quiet --fixed-list-mode --list-secret-keys --with-colons \

diff --git a/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn b/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
index f50cbf064d1409584a7c32bb55a13f4fef5580b4..d9d0fbeea51a51bbd23bf79d3b0f56156b7cdfc6 100644 (file)
--- a/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
+++ b/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
@@ -21,3 +21,5 @@ suggest:
   fail, and report the different key IDs that they user might want to
   select (reporting which keys already have authorization subkeys or
   the authorization capability on the primary key would be useful too)
+
+[[bugs/done]] completed 2008-08-08 09:40:33-0400 (to be released in 0.8-1)