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

Fix up function return values so we can return 1 on an installation error.

Browse Source 
447973
This commit is contained in:
Rob Crittenden 2008-05-22 16:36:11 -04:00
parent a087818197
commit 927447b144
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ipa-server/ipa-install/ipa-server-install
View File

@ -140,7 +140,7 @@ def resolve_host(host_name):
print "The KDC service does not listen on localhost" print "The KDC service does not listen on localhost"
print "" print ""
print "Please fix your /etc/hosts file and restart the setup program" print "Please fix your /etc/hosts file and restart the setup program"
return "-Fatal Error-" return None
except: except:
print "Unable to lookup the IP address of the provided host" print "Unable to lookup the IP address of the provided host"
@ -315,7 +315,7 @@ def main():
if os.getegid() != 0: if os.getegid() != 0:
print "Must be root to setup server" print "Must be root to setup server"
return return 1
signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
@ -370,7 +370,7 @@ def main():
if not bind.check_inst(): if not bind.check_inst():
print "--setup-bind was specified but bind is not installed on the system" print "--setup-bind was specified but bind is not installed on the system"
print "Please install bind and restart the setup program" print "Please install bind and restart the setup program"
return "-Fatal Error-" return 1
# check the hostname is correctly configured, it must be as the kldap # check the hostname is correctly configured, it must be as the kldap
# utilities just use the hostname as returned by gethostbyname to set # utilities just use the hostname as returned by gethostbyname to set
@ -387,7 +387,7 @@ def main():
verify_fqdn(host_default) verify_fqdn(host_default)
except RuntimeError, e: except RuntimeError, e:
logging.error(str(e) + "\n") logging.error(str(e) + "\n")
return "-Fatal Error-" return 1
host_name = host_default host_name = host_default
else: else:
@ -404,17 +404,17 @@ def main():
# Check we have a public IP that is associated with the hostname # Check we have a public IP that is associated with the hostname
ip = resolve_host(host_name) ip = resolve_host(host_name)
if not ip: if ip is None:
if options.ip_address: if options.ip_address:
ip = options.ip_address ip = options.ip_address
if not ip and options.unattended: if ip is None and options.unattended:
print "Unable to resolve IP address for host name" print "Unable to resolve IP address for host name"
return "-Fatal Error-" return 1
if not verify_ip_address(ip): if not verify_ip_address(ip):
ip = "" ip = ""
if options.unattended: if options.unattended:
return "-Fatal Error-" return 1
if options.ip_address and options.ip_address != ip: if options.ip_address and options.ip_address != ip:
if options.setup_bind: if options.setup_bind:
@ -423,12 +423,12 @@ def main():
print "Error: the hostname resolves to an IP address that is different" print "Error: the hostname resolves to an IP address that is different"
print "from the one provided on the command line. Please fix your DNS" print "from the one provided on the command line. Please fix your DNS"
print "or /etc/hosts file and restart the installation." print "or /etc/hosts file and restart the installation."
return "-Fatal Error-" return 1
if options.unattended: if options.unattended:
if not ip: if not ip:
print "Unable to resolve IP address" print "Unable to resolve IP address"
return "-Fatal Error-" return 1
if not ip: if not ip:
ip = read_ip_address(host_name) ip = read_ip_address(host_name)
@ -443,7 +443,7 @@ def main():
if not options.ds_user: if not options.ds_user:
ds_user = read_ds_user() ds_user = read_ds_user()
if ds_user == "": if ds_user == "":
return "-Aborted-" return 1
else: else:
ds_user = options.ds_user ds_user = options.ds_user
@ -523,7 +523,7 @@ def main():
except Exception, e: except Exception, e:
print "Configuration of client side components failed!" print "Configuration of client side components failed!"
print "ipa-client-install returned: " + str(e) print "ipa-client-install returned: " + str(e)
return "-Fatal Error-" return 1
print "==============================================================================" print "=============================================================================="
print "Setup complete" print "Setup complete"
@ -553,8 +553,7 @@ def main():
return 0 return 0
try: try:
main() sys.exit(main())
sys.exit(0)
except SystemExit, e: except SystemExit, e:
sys.exit(e) sys.exit(e)
except Exception, e: except Exception, e: