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

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


Revision: 154415
          https://trac.macports.org/changeset/154415
Author:   larryv at macports.org
Date:     2016-10-29 02:54:44 +0200 (Sat, 29 Oct 2016)
Log Message:
-----------
buildbot: Improve generation of builder names

- Filter out unwanted platforms in one place and avoid repeating the
  conditions.

- Prefer string formatting over concatenation.

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

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-10-29 00:52:48 UTC (rev 154414)
+++ contrib/buildbot-test/master.cfg	2016-10-29 00:54:44 UTC (rev 154415)
@@ -140,11 +140,13 @@
             return True
     return False
 
-base_buildernames = ['base-'+plat for plat in build_platforms if 'legacy' not in plat and '10.6_i386' not in plat]
-portwatcher_buildernames = ['ports-'+plat+'-watcher' for plat in build_platforms if 'linux' not in plat and '10.5_ppc' != plat]
-portbuilder_buildernames = ['ports-'+plat+'-builder' for plat in build_platforms if 'linux' not in plat and '10.5_ppc' != plat]
-portbuilder_triggerables = ['ports-'+plat+'-trigger' for plat in build_platforms if 'linux' not in plat and '10.5_ppc' != plat]
+base_platforms = [plat for plat in build_platforms if 'legacy' not in plat and '10.6_i386' not in plat]
+port_platforms = [plat for plat in build_platforms if 'linux' not in plat and '10.5_ppc' != plat]
 
+base_buildernames = map('base-{}'.format, base_platforms)
+portwatcher_buildernames = map('ports-{}-watcher'.format, port_platforms)
+portbuilder_buildernames = map('ports-{}-builder'.format, port_platforms)
+portbuilder_triggerables = map('ports-{}-trigger'.format, port_platforms)
 
 c['schedulers'] = [
     schedulers.SingleBranchScheduler(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161029/dbff8053/attachment-0002.html>


More information about the macports-changes mailing list