Changeset 80192

Timestamp:

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

Author:

wsiegrist@…

Message:

Use with for opening files

File:

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

contrib/buildbot/master.cfg

@@ -3 +3 @@
 
 import json
+import os
 
 # This is a buildmaster config file. It must be installed as
@@ -14 +15 @@
 # (where /opt/local shouldn't be messed with) and the production server (where
 # it has to be)
-production = True
+
+production = False
+with open(os.path.join(os.path.dirname(__file__), 'config.json')) as f:
+    production = json.load(f)['production']
 
 ####### BUILDSLAVES
@@ -25 +29 @@
 c['slaves'] = []
 if production:
-    slavedata = json.load(open('slaves.json'))
+    slavedata = {}
+    with open(os.path.join(os.path.dirname(__file__), 'slaves.json')) as f:
+        slavedata = json.load(f)
     for slave, pwd in slavedata.items():
         c['slaves'].append(BuildSlave(slave, pwd))
@@ -47 +53 @@
 if production:
     from buildbot.changes.pb import PBChangeSource
-    sourcedata = json.load(open('source.json'))
+    sourcedata = []
+    with open(os.path.join(os.path.dirname(__file__), 'source.json')) as f:
+        sourcedata = json.load(f)
     c['change_source'] = PBChangeSource(user=sourcedata[0], passwd=sourcedata[1])
 else: