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

larryv at macports.org larryv at macports.org
Sat Oct 29 02:29:14 CEST 2016


Revision: 154411
          https://trac.macports.org/changeset/154411
Author:   larryv at macports.org
Date:     2016-10-29 02:29:14 +0200 (Sat, 29 Oct 2016)
Log Message:
-----------
buildbot: Prefer tuples for temporary collections

No particular reason.

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

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-10-29 00:29:10 UTC (rev 154410)
+++ contrib/buildbot-test/master.cfg	2016-10-29 00:29:14 UTC (rev 154411)
@@ -189,7 +189,7 @@
 
 
 if 'www' in config['deploy']:
-    c['schedulers'] += [
+    c['schedulers'].extend((
         SingleBranchScheduler(
             name='www',
             treeStableTimer=300,
@@ -198,10 +198,10 @@
         ForceScheduler(
             name='www_force',
             builderNames=['docs-www'])
-        ]
+        ))
 
 if 'guide' in config['deploy']:
-    c['schedulers'] += [
+    c['schedulers'].extend((
         SingleBranchScheduler(
             name='guide',
             treeStableTimer=300,
@@ -210,7 +210,7 @@
         ForceScheduler(
             name='guide_force',
             builderNames=['docs-www'])
-        ]
+        ))
 
 for i in range(len(portbuilder_buildernames)):
     c['schedulers'].append(
@@ -466,7 +466,7 @@
     alwaysRun=True))
 
 def make_rsync_deploy_steps(host, user, sshkeyfile, sshknownhostsfile, srcpath, destpath):
-    return [
+    return (
         FileDownload(
             name='ssh key',
             description='transferring',
@@ -487,7 +487,7 @@
             descriptionDone='deploy',
             command='rsync -avzhC --delay-updates --delete-delay %s/ %s@%s:%s/' % (srcpath, user, host, destpath),
             env={'RSYNC_RSH': 'ssh -i ssh_key -oUserKnownHostsFile=ssh_known_hosts'})
-        ]
+        )
 
 if 'www' in config['deploy']:
     docs_www_factory = BuildFactory()
@@ -559,16 +559,15 @@
     os_match = extract_os.search(plat)
     os_version = os_match.group(0) if os_match else plat
     if 'legacy' not in plat and '10.6_i386' not in plat:
-        c['builders'] += [
+        c['builders'].append(
             BuilderConfig(
                 name='base-' + plat,
                 slavenames=['base-' + plat],
                 factory=base_factory,
                 tags=['base', os_version],
-                env=merge_dicts(env_buildinfo, {'PATH': path_base}))
-            ]
+                env=merge_dicts(env_buildinfo, {'PATH': path_base})))
     if 'linux' not in plat and '10.5_ppc' != plat:
-        c['builders'] += [
+        c['builders'].extend((
             BuilderConfig(
                 name='ports-' + plat + '-watcher',
                 slavenames=['ports-' + plat],
@@ -581,7 +580,7 @@
                 factory=portbuilder_factory,
                 tags=['portbuilder', os_version],
                 env=merge_dicts(env_buildinfo, {'PATH': path_ports}))
-            ]
+            ))
 
 if 'www' in config['deploy']:
     c['builders'].append(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161029/ad536cb2/attachment-0002.html>


More information about the macports-changes mailing list