From: Jameson Rollins <jrollins@finestructure.net>
Date: Tue, 12 Jan 2010 04:17:38 +0000 (-0500)
Subject: rename keys-from-userid command to more accurate keys-for-userid
X-Git-Tag: monkeysphere_0.28~47
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=fb1f418bda543af10195828a19a7c8cc2b250f8c;p=monkeysphere.git

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 368fdfd..ad4dd06 100644
--- 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 bc390cc..233e63f 100755
--- 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 de97ef7..7bacd4e 100644
--- 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