diff options
Diffstat (limited to 'ipaserver/install/installutils.py')
| -rw-r--r-- | ipaserver/install/installutils.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 42df2b711..9329a51f5 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -780,12 +780,16 @@ def handle_error(error, log_file_name=None): if isinstance(error, ldap.INSUFFICIENT_ACCESS): return "Insufficient access", 1 if isinstance(error, ldap.LOCAL_ERROR): - return error.args[0]['info'], 1 + return error.args[0].get('info', ''), 1 if isinstance(error, ldap.SERVER_DOWN): return error.args[0]['desc'], 1 if isinstance(error, ldap.LDAPError): - return 'LDAP error: %s\n%s' % ( - type(error).__name__, error.args[0]['info']), 1 + message = 'LDAP error: %s\n%s\n%s' % ( + type(error).__name__, + error.args[0]['desc'].strip(), + error.args[0].get('info', '').strip() + ) + return message, 1 if isinstance(error, config.IPAConfigError): message = "An IPA server to update cannot be found. Has one been configured yet?" |