[rhmessaging-commits] rhmessaging commits: r3139 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-03-05 15:46:28 -0500 (Thu, 05 Mar 2009)
New Revision: 3139

Modified:
   mgmt/trunk/cumin/python/cumin/tools.py
Log:
Allow passing in a password non-interactively

Modified: mgmt/trunk/cumin/python/cumin/tools.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/tools.py	2009-02-26 17:19:48 UTC (rev 3138)
+++ mgmt/trunk/cumin/python/cumin/tools.py	2009-03-05 20:46:28 UTC (rev 3139)
@@ -122,7 +122,7 @@
         command.description = "List existing QMF servers"
 
         command = self.AddUser(self, "add-user")
-        command.arguments = ("NAME",)
+        command.arguments = ("NAME", "[PASSWORD]")
         command.description = "Add a new user called NAME"
 
         command = self.RemoveUser(self, "remove-user")
@@ -289,7 +289,12 @@
                 print "Error: a user called '%s' already exists" % name
                 sys.exit(1)
 
-            crypted = crypt_password(prompt_password())
+            try:
+                password = args[2]
+            except IndexError:
+                password = prompt_password()
+            
+            crypted = crypt_password(password)
 
             try:
                 subject = Subject(name=name, password=crypted)