diff options
author | Ana Krivokapic <akrivoka@redhat.com> | 2013-06-06 12:52:08 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-06-07 13:10:45 +0200 |
commit | 86cc18931fa56796e64857e8efab7b3566f81097 (patch) | |
tree | 6fed3ded6fd48bc7d9352cf142b88d1701e6bdff | |
parent | b2c378dcc8221dbf254b0cd0b204e84f0d0eeebf (diff) | |
download | freeipa-86cc18931fa56796e64857e8efab7b3566f81097.tar.gz freeipa-86cc18931fa56796e64857e8efab7b3566f81097.tar.xz freeipa-86cc18931fa56796e64857e8efab7b3566f81097.zip |
Prevent error when running IPA commands with su/sudo
https://fedorahosted.org/freeipa/ticket/3685
-rw-r--r-- | ipalib/plugable.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ipalib/plugable.py b/ipalib/plugable.py index fe09d3a6b..aaa0dea48 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -490,6 +490,11 @@ class API(DictProxy): stream=sys.stderr, level=level, format=LOGGING_FORMAT_STDERR)]) + + if not parser: + parser = self.build_global_parser() + object.__setattr__(self, 'parser', parser) + # Add file handler: if self.env.mode in ('dummy', 'unit_test'): return # But not if in unit-test mode @@ -503,7 +508,6 @@ class API(DictProxy): log.error('Could not create log_dir %r', log_dir) return - level = 'info' if self.env.debug: level = 'debug' @@ -516,10 +520,6 @@ class API(DictProxy): log.error('Cannot open log file %r: %s', self.env.log, e) return - if not parser: - parser = self.build_global_parser() - object.__setattr__(self, 'parser', parser) - def build_global_parser(self, parser=None, context=None): """ Add global options to an optparse.OptionParser instance. |