diff options
| author | Martin Kosek <mkosek@redhat.com> | 2012-07-31 14:11:52 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-08-02 16:14:40 +0200 |
| commit | 79a427277a12925bca3f170cc7a255a2a9e45a10 (patch) | |
| tree | b6a637cd3565adb0fd67a22b80482ddfeb39d39b | |
| parent | c2783b9b54ecae8299da0dc593c3813c2bd26fe2 (diff) | |
| download | freeipa.git-79a427277a12925bca3f170cc7a255a2a9e45a10.tar.gz freeipa.git-79a427277a12925bca3f170cc7a255a2a9e45a10.tar.xz freeipa.git-79a427277a12925bca3f170cc7a255a2a9e45a10.zip | |
Avoid redundant info message during RPM update
A change to ipa-ldap-updater (and thus an RPM update %post scriptlet)
avoiding redundat "IPA is not configured" message in stderr introdocued
in c20d4c71b87365b3b8d9c53418a79f992e68cd00 was reverted in another
patch (b5c1ce88a4a3b35adb3b22bc68fb10b49322641a).
Return the change back to avoid this message during every RPM update
when IPA is not configured. admintool framework was also fixed to
avoid print an empty line when an exception without an error message
is raised.
https://fedorahosted.org/freeipa/ticket/2892
| -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 60096e08..1ba8b6bb 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 0c7d940b..794ea28b 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, []) |