<!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>[154420] 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/154420">154420</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-10-29 03:15:17 +0200 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: Improve creation of mail notifiers
Don't repeat ourselves by assigning to mn and appending it three times.</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 (154419 => 154420)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-10-29 01:10:04 UTC (rev 154419)
+++ contrib/buildbot-test/master.cfg 2016-10-29 01:15:17 UTC (rev 154420)
</span><span class="lines">@@ -734,43 +734,40 @@
</span><span class="cx"> interested_users)
</span><span class="cx">
</span><span class="cx"> if config['production']:
</span><del>- # send mail about base failures to users on the blamelist
- mn = status.MailNotifier(
- fromaddr='buildbot@macports.org',
- extraHeaders={'Reply-To': 'noreply@macports.org'},
- # unless lookup is defined, users have to be configured locally
- # maybe a smarter function is needed, but lookup='' does it for now
- lookup='',
- mode=('problem'),
- builders=base_buildernames,
- #extraRecipients=['...'],
- #smtpPort=25,
- #relayhost='localhost',
- sendToInterestedUsers=True)
- c['status'].append(mn)
</del><ins>+ c['status'].extend((
+ # send mail about base failures to users on the blamelist
+ status.MailNotifier(
+ fromaddr='buildbot@macports.org',
+ extraHeaders={'Reply-To': 'noreply@macports.org'},
+ # unless lookup is defined, users have to be configured locally
+ # maybe a smarter function is needed, but lookup='' does it for now
+ lookup='',
+ mode=('problem'),
+ builders=base_buildernames,
+ #extraRecipients=['...'],
+ #smtpPort=25,
+ #relayhost='localhost',
+ sendToInterestedUsers=True),
+ PortsMailNotifier(
+ fromaddr='buildbot@macports.org',
+ extraHeaders={'Reply-To': 'noreply@macports.org'},
+ lookup='',
+ mode=('failing'),
+ builders=portwatcher_buildernames,
+ #extraRecipients=['...'],
+ #smtpPort=25,
+ #relayhost='localhost',
+ sendToInterestedUsers=True,
+ portMessageFormatter=portWatcherMessageFormatter),
+ # notifications about exceptions
+ status.MailNotifier(
+ fromaddr='buildbot@macports.org',
+ extraHeaders={'Reply-To': 'noreply@macports.org'},
+ mode=('exception'),
+ extraRecipients=['admin@macports.org'],
+ sendToInterestedUsers=False)
+ ))
</ins><span class="cx">
</span><del>- mn = PortsMailNotifier(
- fromaddr='buildbot@macports.org',
- extraHeaders={'Reply-To': 'noreply@macports.org'},
- lookup='',
- mode=('failing'),
- builders=portwatcher_buildernames,
- #extraRecipients=['...'],
- #smtpPort=25,
- #relayhost='localhost',
- sendToInterestedUsers=True,
- portMessageFormatter=portWatcherMessageFormatter)
- c['status'].append(mn)
-
- # notifications about exceptions
- mn = status.MailNotifier(
- fromaddr='buildbot@macports.org',
- extraHeaders={'Reply-To': 'noreply@macports.org'},
- mode=('exception'),
- extraRecipients=['admin@macports.org'],
- sendToInterestedUsers=False)
- c['status'].append(mn)
-
</del><span class="cx"> ####### PROJECT IDENTITY #######
</span><span class="cx">
</span><span class="cx"> # the 'title' string will appear at the top of this buildbot
</span></span></pre>
</div>
</div>
</body>
</html>