From ff3ca61f73d8df244dbd4e6b31fcec3cbfc28097 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 14 Apr 2008 18:04:25 -0400 Subject: Handle exceptions more gracefully on systems with python-ldap 2.2.0 442136 --- ipa-client/ipaclient/ipadiscovery.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ipa-client/ipaclient') diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index b7b691360..2bd151925 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -178,11 +178,14 @@ class IPADiscovery: except LDAPError, err: #no good - 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) + 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)) return [] -- cgit