Skip to content

Commit

Permalink
set __file__ before calling execfile on tacFile for relocatable build…
Browse files Browse the repository at this point in the history
…masters
  • Loading branch information
ddcc authored and djmitche committed Aug 10, 2013
1 parent 8c27b44 commit 755d0cb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions master/buildbot/scripts/base.py
Expand Up @@ -42,8 +42,8 @@ def getConfigFileFromTac(basedir):
# execute the .tac file to see if its configfile location exists
tacFile = os.path.join(basedir, 'buildbot.tac')
if os.path.exists(tacFile):
# don't mess with the global namespace
tacGlobals = {}
# don't mess with the global namespace, but set __file__ for relocatable buildmasters
tacGlobals = {'__file__' : tacFile}
execfile(tacFile, tacGlobals)
return tacGlobals.get("configfile", "master.cfg")
else:
Expand Down

0 comments on commit 755d0cb

Please sign in to comment.