diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2009-11-30 15:48:31 -0500 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2009-12-01 09:52:14 -0700 |
| commit | 060662f320ffb0e78b20713d705d65ebee295678 (patch) | |
| tree | 70ebe8f16a54e3c80bb5ab80a42711fc098bf75a /ipa-client/ipaclient | |
| parent | 384eec771d304df730a6545e777324b310818e56 (diff) | |
| download | freeipa-060662f320ffb0e78b20713d705d65ebee295678.tar.gz freeipa-060662f320ffb0e78b20713d705d65ebee295678.tar.xz freeipa-060662f320ffb0e78b20713d705d65ebee295678.zip | |
Better LDAP error handling in ipa-client-install
Diffstat (limited to 'ipa-client/ipaclient')
| -rw-r--r-- | ipa-client/ipaclient/ipadiscovery.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index e2d2043f9..45d5bd358 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -177,15 +177,11 @@ class IPADiscovery: return [] except LDAPError, err: - #no good - try: - if type(err.message) == dict: - for (k, v) in err.message.iteritems(): - logging.error("LDAP Error: %s" % v ) - else: - logging.error("LDAP Error: "+err.message) - except AttributeError: - logging.error("LDAP Error: "+str(err)) + if not isinstance(err, ldap.TIMEOUT): + logging.error("LDAP Error: %s: %s" % + (err.args[0]['desc'], err.args[0].get('info', ''))) + else: + logging.error("LDAP Error: timeout") return [] |