Hello,

This patch fixes https://fedorahosted.org/freeipa/ticket/3685.

-- 
Regards,

Ana Krivokapic
Associate Software Engineer
FreeIPA team
Red Hat Inc.

From b4e5ba853ee3c4c1aa60024786b2f5bb5c828fa5 Mon Sep 17 00:00:00 2001
From: Ana Krivokapic <akriv...@redhat.com>
Date: Thu, 6 Jun 2013 12:52:08 +0200
Subject: [PATCH] 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 fe09d3a6b489da1e8b3ce31a154c0aea239ddcda..aaa0dea480f092e32815c525751359f056936e3c 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -490,6 +490,11 @@ def bootstrap(self, parser=None, **overrides):
                                           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 @@ def bootstrap(self, parser=None, **overrides):
                 log.error('Could not create log_dir %r', log_dir)
                 return
 
-
         level = 'info'
         if self.env.debug:
             level = 'debug'
@@ -516,10 +520,6 @@ def bootstrap(self, parser=None, **overrides):
             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.
-- 
1.8.1.4

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to