Changed return value to provide helpful message

hash_ops/cisco_pix.py

@@ -14,6 +14,6 @@ def __init__(self):
     def generate(self, cli_object):
         if cli_object.username is None:
             print "You must provide a username for cisco_pix hashes!"
-            return "<Needs username>"
+            return "Cisco_pix hashes require a username"
         generatedhash = cisco_pix.encrypt(cli_object.plaintext, user=cli_object.username)    
         return generatedhash

hash_ops/msdcc.py

@@ -15,6 +15,6 @@ def __init__(self):
     def generate(self, cli_object):
         if cli_object.username is None:
             print "You must provide a username for msdcc hashes!"
-            sys.exit()
+            return "MSDCC hashes require a username"
         generatedhash = msdcc.encrypt(cli_object.plaintext, user=cli_object.username)    
         return generatedhash

hash_ops/msdcc2.py

@@ -13,7 +13,7 @@ def __init__(self):
 
     def generate(self, cli_object):
         if cli_object.username is None:
-            print "You must provide a username for msdcc hashes!"
-            return "<Needs username>"
+            print "You must provide a username for msdcc2 hashes!"
+            return "MSDCC2 Hashes require a username"
         generatedhash = msdcc2.encrypt(cli_object.plaintext, user=cli_object.username)
         return generatedhash

hash_ops/oracle10.py

@@ -2,7 +2,6 @@
 This module generates md5 hashes
 '''
 
-import sys
 from passlib.hash import oracle10
 
 
@@ -15,6 +14,6 @@ def __init__(self):
     def generate(self, cli_object):
         if cli_object.username is None:
             print "You must provide a username for oracle10 hashes!"
-            sys.exit()
+            return "Oracle10 Hashes require a username"
         generatedhash = oracle10.encrypt(cli_object.plaintext, user=cli_object.username)    
         return generatedhash

hash_ops/postgres_md5.py

@@ -15,6 +15,6 @@ def __init__(self):
     def generate(self, cli_object):
         if cli_object.username is None:
             print "You must provide a username for postgres_md5 hashes!"
-            sys.exit()
+            return "Postgres_md5 Hashes require a username"
         generatedhash = postgres_md5.encrypt(cli_object.plaintext, user=cli_object.username)    
         return generatedhash