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

3 files changed, 8 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index f7bf5f0..f6b69f8 100644
--- 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 4a611c8..8ddfe7f 100755
--- 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 f50cbf0..d9d0fbe 100644
--- 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)