summaryrefslogtreecommitdiffstats
path: root/ipapython/admintool.py
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2012-07-31 14:11:52 +0200
committerMartin Kosek <mkosek@redhat.com>2012-08-02 16:14:40 +0200
commit79a427277a12925bca3f170cc7a255a2a9e45a10 (patch)
treeb6a637cd3565adb0fd67a22b80482ddfeb39d39b /ipapython/admintool.py
parentc2783b9b54ecae8299da0dc593c3813c2bd26fe2 (diff)
downloadfreeipa-79a427277a12925bca3f170cc7a255a2a9e45a10.tar.gz
freeipa-79a427277a12925bca3f170cc7a255a2a9e45a10.tar.xz
freeipa-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
Diffstat (limited to 'ipapython/admintool.py')
-rw-r--r--ipapython/admintool.py3
1 files changed, 2 insertions, 1 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',