rename keys-from-userid command to more accurate keys-for-userid

leave the old command for now, but warn as deprecated.

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 368fdfd288dcbaab4628933170d71a8b3679f350..ad4dd063645c499e110d176523c0adad06ba9a16 100644 (file)
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,10 @@
+monkeysphere (0.28-1~pre1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - rename keys-from-userid command to more accurate keys-for-userid
+
+ -- Jameson Rollins <jrollins@finestructure.net>  Mon, 11 Jan 2010 23:16:56 -0500
+
 monkeysphere (0.27-1) unstable; urgency=low
 
   * New upstream release:

diff --git a/src/monkeysphere b/src/monkeysphere
index bc390ccca5e239a83e00e594f576d16cdc6e8fd6..233e63f8e0e56c2faa1a1597b90ce9ae19ad0d70 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -50,7 +50,7 @@ subcommands:
  subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
  sshfpr (f) KEYID                    output ssh fingerprint of gpg key
 
- keys-from-userid (u) USERID         output valid keys for user id literal
+ keys-for-userid (u) USERID          output valid keys for user id literal
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
 
@@ -275,8 +275,13 @@ case $COMMAND in
        gpg_ssh_fingerprint "$@"
        ;;
 
-    'keys-from-userid'|'u')
-       keys_from_userid "$@"
+    'keys-for-userid'|'u')
+       keys_for_userid "$@"
+       ;;
+
+    'keys-from-userid')
+       echo "Warning: this usage is deprecated.  Please use 'keys-for-userid' instead." >&2
+       keys_for_userid "$@"
        ;;
 
     'version'|'--version'|'v')

diff --git a/src/share/common b/src/share/common
index de97ef76085a7fe52b33391d32562329f395fc99..7bacd4e7dca30d5f9dd29bd9b0f129c6c7ac73ba 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -762,7 +762,7 @@ process_user_id() {
 }
 
 # output all valid keys for specified user ID literal
-keys_from_userid() {
+keys_for_userid() {
     local userID
     local noKey=
     local nKeys