Changeset 80193

Timestamp:

07/06/11 08:59:55 (4 years ago)

Author:

wsiegrist@…

Message:

Tweak json file logic so non-production does not need any files

File:

• contrib/buildbot/master.cfg (modified) (4 diffs)

contrib/buildbot/master.cfg

@@ -4 +4 @@
 import json
 import os
+
+
+def _path(name):
+    return os.path.join(os.path.dirname(__file__), name)
 
 # This is a buildmaster config file. It must be installed as
@@ -17 +21 @@
 
 production = False
-with open(os.path.join(os.path.dirname(__file__), 'config.json')) as f:
-    production = json.load(f)['production']
+if os.path.exists(_path('config.json')):
+    with open(_path('config.json')) as f:
+        production = json.load(f)['production']
 
 ####### BUILDSLAVES
@@ -30 +35 @@
 if production:
     slavedata = {}
-    with open(os.path.join(os.path.dirname(__file__), 'slaves.json')) as f:
+    with open(_path('slaves.json')) as f:
         slavedata = json.load(f)
     for slave, pwd in slavedata.items():
@@ -54 +59 @@
     from buildbot.changes.pb import PBChangeSource
     sourcedata = []
-    with open(os.path.join(os.path.dirname(__file__), 'source.json')) as f:
+    with open(_path('source.json')) as f:
         sourcedata = json.load(f)
     c['change_source'] = PBChangeSource(user=sourcedata[0], passwd=sourcedata[1])