diff options
| -rw-r--r-- | ipapython/admintool.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/ipa_ldap_updater.py | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ipapython/admintool.py b/ipapython/admintool.py index 60096e083..1ba8b6bbb 100644 --- a/ipapython/admintool.py +++ b/ipapython/admintool.py @@ -212,7 +212,8 @@ class AdminTool(object): self.log except AttributeError: # Logging was not set up yet - print >> sys.stderr, '\n', error_message + if error_message: + print >> sys.stderr, '\n', error_message else: self.info(''.join(traceback.format_tb(backtrace))) self.info('The %s command failed, exception: %s: %s', diff --git a/ipaserver/install/ipa_ldap_updater.py b/ipaserver/install/ipa_ldap_updater.py index 0c7d940be..794ea28b5 100644 --- a/ipaserver/install/ipa_ldap_updater.py +++ b/ipaserver/install/ipa_ldap_updater.py @@ -25,6 +25,7 @@ # save undo files? import os +import sys import krbV @@ -83,10 +84,14 @@ class LDAPUpdater(admintool.AdminTool): raise admintool.ScriptError("%s: file not found" % filename) if os.getegid() == 0: - installutils.check_server_configuration() + try: + installutils.check_server_configuration() + except RuntimeError, e: + print unicode(e) + sys.exit(1) elif not os.path.exists('/etc/ipa/default.conf'): - raise admintool.ScriptError( - "IPA is not configured on this system.") + print "IPA is not configured on this system." + sys.exit(1) if options.password: pw = ipautil.template_file(options.password, []) |