From 86cc18931fa56796e64857e8efab7b3566f81097 Mon Sep 17 00:00:00 2001 From: Ana Krivokapic Date: Thu, 6 Jun 2013 12:52:08 +0200 Subject: Prevent error when running IPA commands with su/sudo https://fedorahosted.org/freeipa/ticket/3685 --- ipalib/plugable.py | 10 +++++----- 1 file 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. -- cgit