[zorg] r188702 - [llvmlab] Move config.phase_config into a local scope.

[Michael Gottesman]

Author: mgottesman
Date: Mon Aug 19 15:31:41 2013
New Revision: 188702

URL: http://llvm.org/viewvc/llvm-project?rev=188702&view=rev
Log:
[llvmlab] Move config.phase_config into a local scope.

Since the phased clang builder and the normal clang builders are in the same
file, when the normal clang builder is imported, PhasedBuilderUtils is imported
as well. Normal lab.llvm.org installations do not support config.phase_config so
this was causing errors.

Modified:
    zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py

Modified: zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py?rev=188702&r1=188701&r2=188702&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py (original)
+++ zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py Mon Aug 19 15:31:41 2013
@@ -12,9 +12,7 @@ from datetime import datetime, date, tim
 import zorg
 
 import config
-import config.phase_config
 reload(config)
-reload(config.phase_config)
 
 class NamedTrigger(Trigger):
     """Trigger subclass which allows overriding the trigger name, and also
@@ -260,6 +258,9 @@ def set_config_option(section, option, d
         return default
 
 def PublishGoodBuild():
+    import config.phase_config
+    reload(config.phase_config)
+    
     artifacts_dir = set_config_option('Master Options', 'artifacts_path',
                                       os.path.expanduser('~/artifacts/'))
     f = buildbot.process.factory.BuildFactory()