<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-infrastructure.

</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/41e62817a4e2fd4b08551de963b936dea326198b">https://github.com/macports/macports-infrastructure/commit/41e62817a4e2fd4b08551de963b936dea326198b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 41e62817a4e2fd4b08551de963b936dea326198b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 7 11:09:29 2018 -0600

<span style='display:block; white-space:pre;color:#404040;'>    Use a different toolsprefix for jobs
</span>---
 buildbot/config.json.sample | 11 ++++++-----
 buildbot/master.cfg         |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/config.json.sample b/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;color:#808080;'>index 999d717..2f284bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    "production":   false,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    "privkey":      "/var/keys/macports-privkey.pem",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    "buildboturl":  "http://domain.tld:8010/",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    "slaveprefix":  "/opt/local",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    "toolsprefix":  "/opt/mports",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "production":       false,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "privkey":          "/var/keys/macports-privkey.pem",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "buildboturl":      "http://domain.tld:8010/",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "slaveprefix":      "/opt/local",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "toolsprefix":      "/opt/mports",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "jobstoolsprefix":  "/opt/local",
</span>     "deploy": {
         "maxcdn": {
             "secrets": "/var/keys/maxcdn-secrets.json",
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/master.cfg b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;color:#808080;'>index 694f926..0630879 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +81,7 @@ config = {
</span>     # Tooling
     'slaveprefix': '/opt/local',
     'toolsprefix': '/opt/mports',
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    'jobstoolsprefix': '/opt/local',
</span> 
     # Deployment
     'archivesite': 'http://packages.macports.org',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +118,7 @@ config.update(extconfig)
</span> 
 path_base = '/usr/bin:/bin:/usr/sbin:/sbin'
 path_ports = os.path.join(config['toolsprefix'], 'bin') + ':' + path_base
<span style='display:block; white-space:pre;background:#ffe0e0;'>-path_jobs = path_ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+path_jobs = os.path.join(config['jobstoolsprefix'], 'bin') + ':' + path_base
</span> 
 # Allow spaces and tabs in property values
 c['validation'] = {'property_value': re.compile(r'^[ \t\w./~:-]*$')}
</pre><pre style='margin:0'>

</pre>