Adds --password option to virt-who-pasword

virt-who-password currently reads input only interactively via getpass
which prevents it from being used in scripts.

This patch adds fixes the issue by adding options -p and --password.

virtwho/password/__main__.py

@@ -27,26 +27,35 @@
 
 from virtwho.password import Password, UnwritableKeyFile, InvalidKeyFile
 
+from optparse import OptionParser
 
-def main():
-    if len(sys.argv) == 2 and sys.argv[1] in ('-h', '--help'):
-        print """Utility that encrypts passwords for virt-who.
+class RawDescriptionOptionParser(OptionParser):
+    def format_description(self, description):
+        return self.description or ""
+
+def parseOptions():
+    parser = RawDescriptionOptionParser(usage="virt-who-password",
+                                        description="""Utility that encrypts passwords for virt-who.
 
 Enter password that should be encrypted. This encrypted password then can be
 supplied to virt-who configuration.
 
 This command must be executed as root!
 
 WARNING: root user can still decrypt encrypted passwords!
-"""
-        sys.exit(0)
+    """)
+    parser.add_option("-p", "--password", dest="password", help="Password")
+    return parser.parse_args()
+
+def main():
+    options, _args = parseOptions()
 
     if os.getuid() != 0:
         print >>sys.stderr, "Only root can encrypt passwords"
         sys.exit(1)
 
     try:
-        pwd = getpass("Password: ")
+        pwd = options.password or getpass("Password: ")
     except (KeyboardInterrupt, EOFError):
         print
         sys.exit(1)