IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use sys.exit to quit scripts

Browse Source 
Instead of print and return, use sys.exit() to quit scripts with an
error message and a non zero return code.

https://fedorahosted.org/freeipa/ticket/425
This commit is contained in:
Jakub Hrozek
2010-11-08 23:13:48 +01:00
committed by Adam Young
parent 3e540272c6
commit 57e1edd052
6 changed files with 45 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
install/tools/ipa-nis-manage
View File

@@ -88,11 +88,9 @@ def main():
loglevel = logging.DEBUG
if len(args) != 1:
print "You must specify one action, either enable or disable"
sys.exit(1)
sys.exit("You must specify one action, either enable or disable")
elif args[0] != "enable" and args[0] != "disable":
print "Unrecognized action [" + args[0] + "]"
sys.exit(1)
sys.exit("Unrecognized action [" + args[0] + "]")
logging.basicConfig(level=loglevel,
format='%(levelname)s %(message)s')
@@ -118,15 +116,12 @@ def main():
except errors.ACIError:
sys.exit("Incorrect password")
except errors.LDAPError, lde:
print "An error occurred while connecting to the server."
print lde
return 1
sys.exit("An error occurred while connecting to the server: %s" % str(lde))
if args[0] == "enable":
compat = get_entry(compat_dn, conn)
if compat is None:
print "The compat plugin needs to be enabled: ipa-compat-manage enable"
return 1
sys.exit("The compat plugin needs to be enabled: ipa-compat-manage enable")
entry = None
try:
entry = get_entry(nis_config_dn, conn)