<!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>[154411] 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 { white-space: pre-line; 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/154411">154411</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-10-29 02:29:14 +0200 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: Prefer tuples for temporary collections
No particular reason.</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 (154410 => 154411)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if 'www' in config['deploy']:
</span><del>- c['schedulers'] += [
</del><ins>+ c['schedulers'].extend((
</ins><span class="cx"> SingleBranchScheduler(
</span><span class="cx"> name='www',
</span><span class="cx"> treeStableTimer=300,
</span><span class="lines">@@ -198,10 +198,10 @@
</span><span class="cx"> ForceScheduler(
</span><span class="cx"> name='www_force',
</span><span class="cx"> builderNames=['docs-www'])
</span><del>- ]
</del><ins>+ ))
</ins><span class="cx">
</span><span class="cx"> if 'guide' in config['deploy']:
</span><del>- c['schedulers'] += [
</del><ins>+ c['schedulers'].extend((
</ins><span class="cx"> SingleBranchScheduler(
</span><span class="cx"> name='guide',
</span><span class="cx"> treeStableTimer=300,
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> ForceScheduler(
</span><span class="cx"> name='guide_force',
</span><span class="cx"> builderNames=['docs-www'])
</span><del>- ]
</del><ins>+ ))
</ins><span class="cx">
</span><span class="cx"> for i in range(len(portbuilder_buildernames)):
</span><span class="cx"> c['schedulers'].append(
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> alwaysRun=True))
</span><span class="cx">
</span><span class="cx"> def make_rsync_deploy_steps(host, user, sshkeyfile, sshknownhostsfile, srcpath, destpath):
</span><del>- return [
</del><ins>+ return (
</ins><span class="cx"> FileDownload(
</span><span class="cx"> name='ssh key',
</span><span class="cx"> description='transferring',
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx"> descriptionDone='deploy',
</span><span class="cx"> command='rsync -avzhC --delay-updates --delete-delay %s/ %s@%s:%s/' % (srcpath, user, host, destpath),
</span><span class="cx"> env={'RSYNC_RSH': 'ssh -i ssh_key -oUserKnownHostsFile=ssh_known_hosts'})
</span><del>- ]
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx"> if 'www' in config['deploy']:
</span><span class="cx"> docs_www_factory = BuildFactory()
</span><span class="lines">@@ -559,16 +559,15 @@
</span><span class="cx"> os_match = extract_os.search(plat)
</span><span class="cx"> os_version = os_match.group(0) if os_match else plat
</span><span class="cx"> if 'legacy' not in plat and '10.6_i386' not in plat:
</span><del>- c['builders'] += [
</del><ins>+ c['builders'].append(
</ins><span class="cx"> BuilderConfig(
</span><span class="cx"> name='base-' + plat,
</span><span class="cx"> slavenames=['base-' + plat],
</span><span class="cx"> factory=base_factory,
</span><span class="cx"> tags=['base', os_version],
</span><del>- env=merge_dicts(env_buildinfo, {'PATH': path_base}))
- ]
</del><ins>+ env=merge_dicts(env_buildinfo, {'PATH': path_base})))
</ins><span class="cx"> if 'linux' not in plat and '10.5_ppc' != plat:
</span><del>- c['builders'] += [
</del><ins>+ c['builders'].extend((
</ins><span class="cx"> BuilderConfig(
</span><span class="cx"> name='ports-' + plat + '-watcher',
</span><span class="cx"> slavenames=['ports-' + plat],
</span><span class="lines">@@ -581,7 +580,7 @@
</span><span class="cx"> factory=portbuilder_factory,
</span><span class="cx"> tags=['portbuilder', os_version],
</span><span class="cx"> env=merge_dicts(env_buildinfo, {'PATH': path_ports}))
</span><del>- ]
</del><ins>+ ))
</ins><span class="cx">
</span><span class="cx"> if 'www' in config['deploy']:
</span><span class="cx"> c['builders'].append(
</span></span></pre>
</div>
</div>
</body>
</html>