Minor changes to exit statuses and help information.

melloc · Aug 21, 2013 · f6d8b11 · f6d8b11
1 parent d03e3e4
commit f6d8b11
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/chsh b/chsh
@@ -9,8 +9,8 @@ def shellexists(shell):
         return (shell in shells) and os.path.exists(shell)
 
 parser = argparse.ArgumentParser(description="Change a user's shell.")
-parser.add_argument('-s','--shell',type=str,help='The new login shell of the user.',default='')
-parser.add_argument("user",type=str,help='The login whose shell is being changed. This must be a valid shell in /etc/shells.')
+parser.add_argument('-s','--shell',type=str,help='The new login shell of the user. This must be a valid shell in /etc/shells.',default='')
+parser.add_argument("user",type=str,help='The login whose shell is being changed.')
 args = parser.parse_args()
 
 if not shellexists(args.shell):

diff --git a/mailpasswd b/mailpasswd
@@ -23,7 +23,7 @@ def modifyMailpasswd(conn, dn, stdin=False):
         again  = getpass.getpass("New mail password again: ")
         if passwd != again:
             print "Passwords do not match."
-            return
+            exit(1)
 
     conn.modify_s(dn,[(ldap.MOD_REPLACE, 'userPassword', passwd)])
 

diff --git a/manageldap.py b/manageldap.py
diff --git a/useradd b/useradd
@@ -38,3 +38,4 @@ if re.match("^[a-z][a-z0-9-]*$", args.login):
     performLocal(args.login)
 else:
     print("Username must start with a lowercase letter and contain only letters, numbers and dashes.")
+    exit(1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,3 +38,4 @@ if re.match("^[a-z][a-z0-9-]*$", args.login): @@
         performLocal(args.login)
     else:
         print("Username must start with a lowercase letter and contain only letters, numbers and dashes.")
+        exit(1)