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

[mojca at macports.org]

Revision: 151262
          https://trac.macports.org/changeset/151262
Author:   mojca at macports.org
Date:     2016-08-10 23:29:34 -0700 (Wed, 10 Aug 2016)
Log Message:
-----------
buildbot-test/master.cfg: rename 'os' to 'os_version' and switch back to os.path.join

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

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-08-11 05:44:14 UTC (rev 151261)
+++ contrib/buildbot-test/master.cfg	2016-08-11 06:29:34 UTC (rev 151262)
@@ -294,7 +294,7 @@
         alwaysUseLatest=True,
         preferLastChangedRev=True,
         mode="incremental",
-        workdir=portwatcher_factory.workdir+"/mpbb",
+        workdir=os.path.join(portwatcher_factory.workdir, "/mpbb"),
         haltOnFailure=True))
 
     portwatcher_factory.addStep(ShellCommand(
@@ -442,14 +442,14 @@
 extract_os = re.compile("10\.\d+")
 for plat in build_platforms:
     os_match = extract_os.search(plat)
-    os = os_match.group(0) if os_match else 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'] += [
             BuilderConfig(
                 name="base-" + plat,
                 slavenames=["base-" + plat],
                 factory=base_factory,
-                tags=["base", os],
+                tags=["base", os_version],
                 env={"PATH": path_base})]
     if 'linux' not in plat:
         c['builders'] += [
@@ -457,13 +457,13 @@
                 name="ports-" + plat + "-watcher",
                 slavenames=["ports-" + plat],
                 factory=make_portwatcher_factory("ports-" + plat + "-trigger"),
-                tags=["portwatcher", os],
+                tags=["portwatcher", os_version],
                 env={"PATH": path_ports}),
             BuilderConfig(
                 name="ports-" + plat + "-builder",
                 slavenames=["ports-" + plat],
                 factory=portbuilder_factory,
-                tags=["portbuilder", os],
+                tags=["portbuilder", os_version],
                 env={"PATH": path_ports})]
 
 ####### STATUS TARGETS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160810/a6041249/attachment.html>