<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146939] contrib/buildbot-test/master.cfg</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146939">146939</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-03-21 02:15:18 -0700 (Mon, 21 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>buildbot-test: replace tabs with spaces, other whitespace changes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#contribbuildbottestmastercfg">contrib/buildbot-test/master.cfg</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribbuildbottestmastercfg"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/master.cfg (146938 => 146939)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg        2016-03-21 05:47:35 UTC (rev 146938)
+++ contrib/buildbot-test/master.cfg        2016-03-21 09:15:18 UTC (rev 146939)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- python -*-
</del><ins>+####### -*- python -*-
</ins><span class="cx"> # ex: set syntax=python:
</span><span class="cx"> # vim:ft=python
</span><span class="cx"> 
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">         if f.startswith('base'):
</span><span class="cx">             return True
</span><span class="cx">     return False
</span><del>-        
</del><ins>+
</ins><span class="cx"> from buildbot.changes.filter import ChangeFilter
</span><span class="cx"> portsfilter = ChangeFilter(filter_fn=change_has_ports)
</span><span class="cx"> basefilter = ChangeFilter(filter_fn=change_has_base)
</span><span class="lines">@@ -127,43 +127,43 @@
</span><span class="cx"> from buildbot.schedulers.forcesched import StringParameter
</span><span class="cx"> from buildbot.schedulers.triggerable import Triggerable
</span><span class="cx"> 
</span><del>-c['schedulers'] = [SingleBranchScheduler(
-                            name=&quot;base&quot;,
-                            treeStableTimer=None,
-                            change_filter = basefilter,
-                            builderNames=base_buildernames),
-                   SingleBranchScheduler(
-                            name=&quot;ports&quot;,
-                            treeStableTimer=None,
-                            change_filter = portsfilter,
-                            builderNames=portwatcher_buildernames),
-                   ForceScheduler(
-                            name=&quot;base_force&quot;,
-                            builderNames=base_buildernames),
-                   ForceScheduler(
-                            name=&quot;portbuilder_force&quot;,
-                            builderNames=portbuilder_buildernames,
-                            properties=[
-                                    StringParameter(
-                                        name=&quot;portname&quot;,
-                                        label=&quot;Port name:&quot;,
-                                        default=&quot;&quot;)
-                            ]),
-                   ForceScheduler(
-                            name=&quot;portwatcher_force&quot;,
-                            builderNames=portwatcher_buildernames,
-                            properties=[
-                                    StringParameter(
-                                        name=&quot;portlist&quot;,
-                                        label=&quot;Port list:&quot;,
-                                        default=&quot;&quot;,
-                                        size=30)
-                            ])
-                ]
</del><ins>+c['schedulers'] = [
+    SingleBranchScheduler(
+        name=&quot;base&quot;,
+        treeStableTimer=None,
+        change_filter = basefilter,
+        builderNames=base_buildernames),
+    SingleBranchScheduler(
+        name=&quot;ports&quot;,
+        treeStableTimer=None,
+        change_filter = portsfilter,
+        builderNames=portwatcher_buildernames),
+    ForceScheduler(
+        name=&quot;base_force&quot;,
+        builderNames=base_buildernames),
+    ForceScheduler(
+        name=&quot;portbuilder_force&quot;,
+        builderNames=portbuilder_buildernames,
+        properties=[StringParameter(
+            name=&quot;portname&quot;,
+            label=&quot;Port name:&quot;,
+            default=&quot;&quot;)
+        ]),
+    ForceScheduler(
+        name=&quot;portwatcher_force&quot;,
+        builderNames=portwatcher_buildernames,
+        properties=[StringParameter(
+            name=&quot;portlist&quot;,
+            label=&quot;Port list:&quot;,
+            default=&quot;&quot;,
+            size=30)
+        ])
+    ]
</ins><span class="cx"> 
</span><span class="cx"> for i in range(len(portbuilder_buildernames)):
</span><del>-    c['schedulers'].append(Triggerable(name=portbuilder_triggerables[i],
-                                       builderNames=[portbuilder_buildernames[i]]))
</del><ins>+    c['schedulers'].append(Triggerable(
+        name=portbuilder_triggerables[i],
+        builderNames=[portbuilder_buildernames[i]]))
</ins><span class="cx"> 
</span><span class="cx"> ####### BUILDERS
</span><span class="cx"> 
</span><span class="lines">@@ -180,9 +180,11 @@
</span><span class="cx"> from buildbot.steps.shell import ShellCommand, Compile, Configure, SetPropertyFromCommand
</span><span class="cx"> 
</span><span class="cx"> base_factory = BuildFactory()
</span><del>-base_factory.addStep(SVN(repourl='https://svn.macports.org/repository/macports/trunk/base',
-#base_factory.addStep(SVN(repourl=Interpolate('https://svn.macports.org/repository/macports/%(src::branch:-trunk)s/base'),
-                         method=&quot;copy&quot;))
</del><ins>+#base_factory.addStep(SVN(
+#   repourl=Interpolate('https://svn.macports.org/repository/macports/%(src::branch:-trunk)s/base'),
+base_factory.addStep(SVN(
+    repourl='https://svn.macports.org/repository/macports/trunk/base',
+    method=&quot;copy&quot;))
</ins><span class="cx"> base_factory.addStep(Configure(command=WithProperties(&quot;&quot;&quot;
</span><span class="cx"> env PATH=/usr/bin:/bin:/usr/sbin:/sbin ./configure --enable-readline \
</span><span class="cx">     --prefix=%(workdir)s/opt/local \
</span><span class="lines">@@ -191,34 +193,42 @@
</span><span class="cx">     --with-install-group=`id -gn` \
</span><span class="cx"> &quot;&quot;&quot;),logfiles={&quot;config.log&quot;: &quot;config.log&quot;}))
</span><span class="cx"> base_factory.addStep(Compile(command=&quot;make -j`sysctl -n hw.activecpu`&quot;))
</span><del>-base_factory.addStep(ShellCommand(command=&quot;make install&quot;, name=&quot;install&quot;, description=&quot;install&quot;))
-base_factory.addStep(ShellCommand(command=&quot;make test&quot;, name=&quot;test&quot;, description=&quot;test&quot;))
-base_factory.addStep(ShellCommand(command=WithProperties(&quot;make distclean; rm -rf %(workdir)s/opt/local&quot;), 
-                     name=&quot;clean&quot;, description=&quot;clean&quot;))
</del><ins>+base_factory.addStep(ShellCommand(
+    command=&quot;make install&quot;,
+    name=&quot;install&quot;,
+    description=&quot;install&quot;))
+base_factory.addStep(ShellCommand(
+    command=&quot;make test&quot;,
+    name=&quot;test&quot;,
+    description=&quot;test&quot;))
+base_factory.addStep(ShellCommand(
+    command=WithProperties(&quot;make distclean; rm -rf %(workdir)s/opt/local&quot;),
+    name=&quot;clean&quot;,
+    description=&quot;clean&quot;))
</ins><span class="cx"> 
</span><span class="cx"> # custom class to make the file list available on the slave...
</span><span class="cx"> class SetPropertyFromCommandWithPortlist(SetPropertyFromCommand):
</span><del>-         name = 'generate portlist'
-         description = 'generate portlist'
</del><ins>+    name = 'generate portlist'
+    description = 'generate portlist'
</ins><span class="cx"> 
</span><del>-         def setBuild(self, build):
-            SetPropertyFromCommand.setBuild(self, build)
-            
-            portset = set()
-            # support forced build properties
-            if self.getProperty('portlist'):
-                for v in self.getProperty('portlist').strip().split():
-                    portset.add(v)
</del><ins>+    def setBuild(self, build):
+        SetPropertyFromCommand.setBuild(self, build)
</ins><span class="cx"> 
</span><del>-            # paths should be dports/category/portdir(/...)
-            for f in self.build.allFiles():
-                comps = f.split('/')
-                if len(comps) &gt;= 3 and comps[0] == 'dports' and comps[1] != '_resources':
-                    portset.add(comps[2])
</del><ins>+        portset = set()
+        # support forced build properties
+        if self.getProperty('portlist'):
+            for v in self.getProperty('portlist').strip().split():
+                portset.add(v)
</ins><span class="cx"> 
</span><del>-            self.setProperty('fullportlist', ' '.join(portset))
</del><ins>+        # paths should be dports/category/portdir(/...)
+        for f in self.build.allFiles():
+            comps = f.split('/')
+            if len(comps) &gt;= 3 and comps[0] == 'dports' and comps[1] != '_resources':
+                portset.add(comps[2])
</ins><span class="cx"> 
</span><ins>+        self.setProperty('fullportlist', ' '.join(portset))
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> # can't run with prefix inside the workdir in production,
</span><span class="cx"> # because archives must be built with prefix=/opt/local
</span><span class="cx"> if production:
</span><span class="lines">@@ -227,9 +237,8 @@
</span><span class="cx">     dlpath='/var/www/html/packages'
</span><span class="cx"> else:
</span><span class="cx">     prefix=slaveprefix
</span><del>-
</del><ins>+    dlhost=''
</ins><span class="cx">     dlpath='./deployed_archives'
</span><del>-    dlhost=''
</del><span class="cx"> 
</span><span class="cx"> ulpath='archive_staging'
</span><span class="cx"> ulpath_unique=ulpath+'-%(buildername)s'
</span><span class="lines">@@ -248,66 +257,100 @@
</span><span class="cx">             for port in self.build.getProperty(&quot;subportlist&quot;).split():
</span><span class="cx">                 sp.append([scheduler,{&quot;portname&quot;: port}])
</span><span class="cx">         return sp
</span><del>-        
</del><span class="cx"> 
</span><ins>+
</ins><span class="cx"> # -- Port Watcher --
</span><span class="cx"> 
</span><span class="cx"> def make_portwatcher_factory(triggerable):
</span><del>-        portwatcher_factory = BuildFactory()
-        # get mp-buildbot; we'll do the checkout of base and dports via these scripts
-        portwatcher_factory.addStep(SVN(repourl=mpbbsvnurl,alwaysUseLatest=True,preferLastChangedRev=True,mode=&quot;incremental&quot;,workdir=&quot;build/mpbb&quot;,haltOnFailure=True))
</del><ins>+    portwatcher_factory = BuildFactory()
+    # get mp-buildbot; we'll do the checkout of base and dports via these scripts
+    portwatcher_factory.addStep(SVN(
+        repourl=mpbbsvnurl,
+        alwaysUseLatest=True,
+        preferLastChangedRev=True,
+        mode=&quot;incremental&quot;,
+        workdir=&quot;build/mpbb&quot;,
+        haltOnFailure=True))
</ins><span class="cx"> 
</span><del>-        portwatcher_factory.addStep(SetPropertyFromCommandWithPortlist(command=WithProperties('for portname in %(fullportlist)s; do for subport in `./mpbb/tools/subports.tcl $portname`; do echo $subport; done; done' ),
-                                                                       property=&quot;subportlist&quot;,
-                                                                        name=&quot;subports&quot;, description=&quot;subports&quot;))
</del><ins>+    portwatcher_factory.addStep(SetPropertyFromCommandWithPortlist(
+        command=WithProperties('for portname in %(fullportlist)s; do for subport in `./mpbb/tools/subports.tcl $portname`; do echo $subport; done; done' ),
+        property=&quot;subportlist&quot;,
+        name=&quot;subports&quot;,
+        description=&quot;subports&quot;))
</ins><span class="cx"> 
</span><del>-        portwatcher_factory.addStep(TriggerWithPortlist(schedulerNames=[triggerable],
-                                                        waitForFinish=True,
-                                                        updateSourceStamp=True))
</del><ins>+    portwatcher_factory.addStep(TriggerWithPortlist(
+        schedulerNames=[triggerable],
+        waitForFinish=True,
+        updateSourceStamp=True))
</ins><span class="cx"> 
</span><del>-        # make a logfile summarising the success/failure status for each port
-        #portwatcher_factory.addStep(ShellCommand(command=[&quot;./do_status.sh&quot;],
-        #                                   name=&quot;status&quot;,
-        #                                   description=&quot;status&quot;,
-        #                        env={'PREFIX': WithProperties(prefix)
-        #                             },
-        #                        logfiles={&quot;portstatus&quot;: &quot;portstatus.log&quot;}))
</del><ins>+    # make a logfile summarising the success/failure status for each port
+    #portwatcher_factory.addStep(ShellCommand(command=[&quot;./do_status.sh&quot;],
+    #                                   name=&quot;status&quot;,
+    #                                   description=&quot;status&quot;,
+    #                        env={'PREFIX': WithProperties(prefix)
+    #                             },
+    #                        logfiles={&quot;portstatus&quot;: &quot;portstatus.log&quot;}))
</ins><span class="cx"> 
</span><del>-        return portwatcher_factory
</del><ins>+    return portwatcher_factory
</ins><span class="cx"> 
</span><span class="cx"> from buildbot.process.buildstep import BuildStep
</span><span class="cx"> 
</span><span class="cx"> class InfoStep(BuildStep):
</span><del>-        def __init__(self, title='', **kwargs):
-                BuildStep.__init__(self,**kwargs)
-                self.name = title
-                self.description = title
-                self.descriptionDone = title
-                self.doStepIf = False
</del><ins>+    def __init__(self, title='', **kwargs):
+        BuildStep.__init__(self, **kwargs)
+        self.name            = title
+        self.description     = title
+        self.descriptionDone = title
+        self.doStepIf        = False
</ins><span class="cx"> 
</span><span class="cx"> # -- Port Builder --
</span><span class="cx"> 
</span><span class="cx"> portbuilder_factory = BuildFactory()
</span><span class="cx"> 
</span><span class="cx"> # XXX: use InfoStep instead of running a dummy command
</span><del>-portbuilder_factory.addStep(ShellCommand(command=[&quot;/usr/bin/true&quot;],description=[WithProperties(&quot;Port %(portname)s&quot;)]))
</del><ins>+portbuilder_factory.addStep(ShellCommand(
+    command=[&quot;/usr/bin/true&quot;],
+    description=[WithProperties(&quot;Port %(portname)s&quot;)]))
</ins><span class="cx"> #portbuilder_factory.addStep(InfoStep(title=WithProperties(&quot;Port %(portname)s&quot;)))
</span><span class="cx"> 
</span><del>-portbuilder_factory.addStep(SVN(repourl=mpbbsvnurl,alwaysUseLatest=True,preferLastChangedRev=True,mode=&quot;incremental&quot;,workdir=&quot;build/mpbb&quot;,haltOnFailure=True))
-portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'selfupdate', '--prefix', WithProperties(prefix)],haltOnFailure=True,
-                                         name=&quot;selfupdate&quot;, description=&quot;selfupdate&quot;))
-portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', svnurl],
-                                         timeout=3600,haltOnFailure=True,
-                                         name=&quot;checkout&quot;, description=&quot;checkout&quot;))
-portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'install-dependencies', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],haltOnFailure=True,
-                                         name=&quot;install-dependencies&quot;, description=&quot;install-dependencies&quot;))
-portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'install-port', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],haltOnFailure=True,
-                                         name=&quot;install-port&quot;, description=&quot;install-port&quot;))
-portbuilder_factory.addStep(ShellCommand(command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s'), '--archive-site', archivesite, '--staging-dir', ulpath],haltOnFailure=True,
-                                         name=&quot;gather-archives&quot;, description=&quot;gather-archives&quot;))
</del><ins>+portbuilder_factory.addStep(SVN(
+    repourl=mpbbsvnurl,
+    alwaysUseLatest=True,
+    preferLastChangedRev=True,
+    mode=&quot;incremental&quot;,
+    workdir=&quot;build/mpbb&quot;,
+    haltOnFailure=True))
+portbuilder_factory.addStep(ShellCommand(
+    command=['./mpbb/mpbb', 'selfupdate', '--prefix', WithProperties(prefix)],
+    name=&quot;selfupdate&quot;,
+    description=&quot;selfupdate&quot;,
+    haltOnFailure=True))
+portbuilder_factory.addStep(ShellCommand(
+    command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', svnurl],
+    timeout=3600,
+    name=&quot;checkout&quot;,
+    description=&quot;checkout&quot;,
+    haltOnFailure=True))
+portbuilder_factory.addStep(ShellCommand(
+    command=['./mpbb/mpbb', 'install-dependencies', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
+    name=&quot;install-dependencies&quot;,
+    description=&quot;install-dependencies&quot;,
+    haltOnFailure=True))
+portbuilder_factory.addStep(ShellCommand(
+    command=['./mpbb/mpbb', 'install-port', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
+    name=&quot;install-port&quot;,
+    description=&quot;install-port&quot;,
+    haltOnFailure=True))
+portbuilder_factory.addStep(ShellCommand(
+    command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s'), '--archive-site', archivesite, '--staging-dir', ulpath],
+    name=&quot;gather-archives&quot;,
+    description=&quot;gather-archives&quot;,
+    haltOnFailure=True))
</ins><span class="cx"> 
</span><span class="cx"> # upload archives from build slave to master
</span><del>-portbuilder_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=WithProperties(ulpath_unique)))
</del><ins>+portbuilder_factory.addStep(DirectoryUpload(
+    slavesrc=ulpath,
+    masterdest=WithProperties(ulpath_unique)))
</ins><span class="cx"> 
</span><span class="cx"> # XXX: move deploy_archives.sh functionality to mp-buildbot
</span><span class="cx"> # sign generated binaries and sync to download server (if distributable)
</span><span class="lines">@@ -336,7 +379,7 @@
</span><span class="cx"> if production:
</span><span class="cx">     slavenames = slavedata.keys()
</span><span class="cx">     for plat in build_platforms:
</span><del>-        baseslaves[plat] = filter(lambda x: x.endswith(plat+&quot;-base&quot;), slavenames)
</del><ins>+        baseslaves[plat]  = filter(lambda x: x.endswith(plat+&quot;-base&quot;),  slavenames)
</ins><span class="cx">         portsslaves[plat] = filter(lambda x: x.endswith(plat+&quot;-ports&quot;), slavenames)
</span><span class="cx"> #else:
</span><span class="cx">     #slavenames = [&quot;snowleopard-x86_64&quot;]
</span><span class="lines">@@ -350,8 +393,8 @@
</span><span class="cx">         name=&quot;base-&quot; + plat,
</span><span class="cx">         slavenames=[&quot;base-&quot; + plat],
</span><span class="cx">         factory=base_factory,
</span><del>-        env={&quot;PATH&quot;: &quot;/usr/bin:/bin:/usr/sbin:/sbin&quot;})] 
-    if 'linux' not in plat: 
</del><ins>+        env={&quot;PATH&quot;: &quot;/usr/bin:/bin:/usr/sbin:/sbin&quot;})]
+    if 'linux' not in plat:
</ins><span class="cx">         c['builders'] += [
</span><span class="cx">             BuilderConfig(
</span><span class="cx">                 name=&quot;portwatcher-&quot; + plat,
</span><span class="lines">@@ -382,21 +425,25 @@
</span><span class="cx"> htauth = HTPasswdAuth(htpasswdfile)
</span><span class="cx"> 
</span><span class="cx"> authz_cfg=authz.Authz(
</span><del>-    auth=htauth,
-    gracefulShutdown = 'auth',
-    forceBuild = 'auth',
-    forceAllBuilds = 'auth',
-    pingBuilder = 'auth',
-    stopBuild = 'auth',
-    stopAllBuilds = 'auth',
</del><ins>+    auth               = htauth,
+    gracefulShutdown   = 'auth',
+    forceBuild         = 'auth',
+    forceAllBuilds     = 'auth',
+    pingBuilder        = 'auth',
+    stopBuild          = 'auth',
+    stopAllBuilds      = 'auth',
</ins><span class="cx">     cancelPendingBuild = 'auth',
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> if production:
</span><span class="cx">     # send mail about base failures to users on the blamelist
</span><span class="cx">     from buildbot.status.mail import MailNotifier
</span><del>-    mn = MailNotifier(fromaddr=&quot;noreply@macports.org&quot;, lookup=&quot;&quot;, relayhost=&quot;localhost&quot;,
-        builders=base_buildernames, mode=&quot;problem&quot;)
</del><ins>+    mn = MailNotifier(
+        fromaddr=&quot;noreply@macports.org&quot;,
+        lookup=&quot;&quot;,
+        relayhost=&quot;localhost&quot;,
+        builders=base_buildernames,
+        mode=&quot;problem&quot;)
</ins><span class="cx">     c['status'].append(mn)
</span><span class="cx"> 
</span><span class="cx">     import subprocess
</span><span class="lines">@@ -459,10 +506,10 @@
</span><span class="cx"> 
</span><span class="cx"> c['buildbotURL'] = buildboturl
</span><span class="cx"> c['status'].append(html.WebStatus(
</span><del>-        http_port=httpport,
-        authz=authz_cfg,
-        changecommentlink=(r&quot;#(\d+)&quot;, r&quot;https://trac.macports.org/ticket/\1&quot;, r&quot;Ticket \g&lt;0&gt;&quot;)
-    ))
</del><ins>+    http_port=httpport,
+    authz=authz_cfg,
+    changecommentlink=(r&quot;#(\d+)&quot;, r&quot;https://trac.macports.org/ticket/\1&quot;, r&quot;Ticket \g&lt;0&gt;&quot;)
+))
</ins><span class="cx"> 
</span><span class="cx"> c['revlink'] = util.RevlinkMatch([r'https://svn.macports.org/repository/macports/(.*)'],
</span><span class="cx">                                   r'https://trac.macports.org/changeset/%s')
</span><span class="lines">@@ -478,8 +525,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> ######## Cache settings
</span><del>-c['buildHorizon'] = 10000
-c['logHorizon'] = 5000
-c['eventHorizon'] = 2000
-c['buildCacheSize'] = 600
-
</del><ins>+c['buildHorizon']   = 10000
+c['logHorizon']     =  5000
+c['eventHorizon']   =  2000
+c['buildCacheSize'] =   600
</ins></span></pre>
</div>
</div>

</body>
</html>