From eef056165f437e07c4a792d5545817a5517c59de Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 16 May 2012 16:38:01 -0400 Subject: Include more information when IP address is not local during installation. Provide the IP address we resolved when displaying the exception. Also handle the exception ourselves with sys.exit(). https://fedorahosted.org/freeipa/ticket/2654 --- ipaserver/install/installutils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ipaserver/install') diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 3e7ae41b..fc54b74b 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -574,7 +574,10 @@ def get_server_ip_address(host_name, fstore, unattended, options): else: ip = read_ip_address(host_name, fstore) elif len(hostaddr) == 1: - ip = ipautil.CheckedIPAddress(hostaddr[0], match_local=True) + try: + ip = ipautil.CheckedIPAddress(hostaddr[0], match_local=True) + except ValueError, e: + sys.exit("Invalid IP Address %s for %s: %s" % (hostaddr[0], host_name, unicode(e))) else: # hostname is not resolvable ip = options.ip_address -- cgit