[153425] contrib/buildbot-test/master.cfg

[larryv at macports.org]

Revision: 153425
          https://trac.macports.org/changeset/153425
Author:   larryv at macports.org
Date:     2016-09-29 18:36:55 -0700 (Thu, 29 Sep 2016)
Log Message:
-----------
buildbot: Don't fail if config.json is missing fields

Modified Paths:
--------------
    contrib/buildbot-test/master.cfg

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-09-30 01:36:54 UTC (rev 153424)
+++ contrib/buildbot-test/master.cfg	2016-09-30 01:36:55 UTC (rev 153425)
@@ -44,9 +44,7 @@
 if os.path.exists(_path('config.json')):
     with open(_path('config.json')) as f:
         configdata = json.load(f)
-    for key in config:
-        if configdata[key]:
-            config[key] = configdata[key]
+    config.update(configdata)
 
 path_base  = '/usr/bin:/bin:/usr/sbin:/sbin'
 path_ports = os.path.join(config['toolsprefix'], 'bin') + ':' + path_base
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20160929/09bd65dc/attachment-0002.html>