[Buildbot-commits] buildbot/buildbot master.py,1.57,1.58

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv974/buildbot

Modified Files:
	master.py 
Log Message:
(BuildMaster.loadConfig): only call exec() with one dict, apparently exec has
some scoping bugs when used with both global/local dicts. Thanks to Nathaniel
Smith for the catch.


Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- master.py	6 Dec 2004 07:36:34 -0000	1.57
+++ master.py	4 Apr 2005 07:10:22 -0000	1.58
@@ -657,10 +657,9 @@
         f.close()
 
     def loadConfig(self, f):
-        globalDict = {}
         localDict = {'basedir': os.path.expanduser(self.basedir)}
         try:
-            exec f in globalDict, localDict
+            exec f in localDict
         except:
             log.msg("error while parsing config file")
             raise