[Buildbot-commits] buildbot/buildbot/status html.py, 1.90, 1.91 mail.py, 1.27, 1.28

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25647/buildbot/status

Modified Files:
	html.py mail.py 
Log Message:
[project @ improve recording/announcing the buildslave's name for each build]

Original author: warner at lothar.com
Date: 2006-09-25 02:40:54

Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- html.py	6 Sep 2006 00:41:55 -0000	1.90
+++ html.py	25 Sep 2006 02:43:56 -0000	1.91
@@ -324,10 +324,10 @@
                                                                  projectName)
         # the color in the following line gives python-mode trouble
         data += ("<h1>Build <a href=\"%s\">%s</a>:#%d</h1>\n"
-                 "<h2>Reason:</h2>\n%s\n"
                  % (self.status.getURLForThing(b.getBuilder()),
-                    b.getBuilder().getName(), b.getNumber(),
-                    html.escape(b.getReason())))
+                    b.getBuilder().getName(), b.getNumber()))
+        data += "<h2>Buildslave:</h2>\n %s\n" % html.escape(b.getSlavename())
+        data += "<h2>Reason:</h2>\n%s\n" % html.escape(b.getReason())
 
         branch, revision, patch = b.getSourceStamp()
         data += "<h2>SourceStamp:</h2>\n"
@@ -345,7 +345,6 @@
             data += "  <li>build of most recent revision</li>\n"
         data += " </ul>\n"
         if b.isFinished():
-            data += "<h4>Buildslave: %s</h4>\n" % html.escape(b.getSlavename())
             data += "<h2>Results:</h2>\n"
             data += " ".join(b.getText()) + "\n"
             if b.getTestResults():

Index: mail.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/mail.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mail.py	6 Sep 2006 00:41:55 -0000	1.27
+++ mail.py	25 Sep 2006 02:43:56 -0000	1.28
@@ -239,6 +239,7 @@
         if url:
             text += "Buildbot URL: %s\n\n" % urllib.quote(url, '/:')
 
+        text += "Buildslave for this Build: %s\n\n" % build.getSlavename()
         text += "Build Reason: %s\n" % build.getReason()
 
         patch = None