summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2012-01-20 15:15:11 +0100
committerMartin Kosek <mkosek@redhat.com>2012-01-20 16:28:09 +0100
commitae2e49a22277a17269833ec13fa657fdc2547b36 (patch)
treeba9d02e4126cea7d9dae03e074758bb373183f6d /ipalib
parent092dd8db1293599a4b7f0ab33ea43e8082ec554f (diff)
downloadfreeipa-ae2e49a22277a17269833ec13fa657fdc2547b36.tar.gz
freeipa-ae2e49a22277a17269833ec13fa657fdc2547b36.tar.xz
freeipa-ae2e49a22277a17269833ec13fa657fdc2547b36.zip
Improve host-add error message
host-add command allows to add a host and its IP address via --ip-address option. When the address is invalid, it throws an error and refuses to operate. However, the invalid IP address error message is always the same which is not right as it forces a user to guess the reason of rejection (loopback address, link-local address or invalid address at all was passed, etc.). This patch changes host-add validator to print the error message. https://fedorahosted.org/freeipa/ticket/2229
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/plugins/host.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index 33d60ad1..fb5f4ea2 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -203,8 +203,8 @@ def validate_ipaddr(ugettext, ipaddr):
"""
try:
ip = CheckedIPAddress(ipaddr, match_local=False)
- except:
- return _('invalid IP address')
+ except Exception, e:
+ return unicode(e)
return None