[KVM-AUTOTEST] fix an error of undefine variable

Commit Message

Amos Kong Sept. 23, 2009, 2:32 a.m. UTC

Sorry for lost [e-mail]. So send again. Thanks.
------------------------------------------------------
fix an error of undefine variable

09/23 09:50:27 ERROR| traceback:0013|   File "/usr/lib64/python2.4/logging/__init__.py", line 744, in emit
09/23 09:50:27 ERROR| traceback:0013|     self.handleError(record)
09/23 09:50:27 ERROR| traceback:0013|   File "/root/project/autotest/client/setup_modules.py", line 86, in _autotest_logging_handle_error
09/23 09:50:27 ERROR| traceback:0013|     traceback.print_stack()
09/23 09:50:27 ERROR|setup_modu:0087| Future logging formatting exceptions disabled.
09/23 09:50:27 ERROR|       kvm:0067| Test failed: global name 'root_module_name' is not defined

Signed-off-by: Amos Kong <[e-mail]>
---
 client/setup_modules.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Patch

diff --git a/client/setup_modules.py b/client/setup_modules.py
index dc255c4..8b3200b 100644
--- a/client/setup_modules.py
+++ b/client/setup_modules.py
@@ -86,7 +86,7 @@  def _autotest_logging_handle_error(self, record):
         traceback.print_stack()
         sys.stderr.write('Future logging formatting exceptions disabled.\n')
 
-    if root_module_name == 'autotest_lib':
+    if global_root_module_name == 'autotest_lib':
         # Allow locally installed third party packages to be found
         # before any that are installed on the system itself when not.
         # running as a client.
@@ -124,6 +124,8 @@  def setup(base_path, root_module_name=""):
     The setup must be different if you are running on an Autotest server
     or on a test machine that just has the client directories installed.
     """
+    global global_root_module_name
+    global_root_module_name = root_module_name
     # Hack... Any better ideas?
     if (root_module_name == 'autotest_lib.client' and
         os.path.exists(os.path.join(os.path.dirname(__file__),