[Buildbot-commits] buildbot/buildbot/status html.py, 1.99, 1.100 mail.py, 1.34, 1.35

[Brian Warner]

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

Modified Files:
	html.py mail.py 
Log Message:
[project @ update CREDITS]

Original author: warner at lothar.com

Date: 2007-04-17 06:38:12+00:00

Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- html.py	15 Apr 2007 01:28:47 -0000	1.99
+++ html.py	17 Apr 2007 06:38:51 -0000	1.100
@@ -1,1731 +1,7 @@
-# -*- test-case-name: buildbot.test.test_web -*-
-
-from __future__ import generators
-
-from twisted.python import log, components
-import urllib, re
-
-from twisted.internet import defer, reactor
-from twisted.web.resource import Resource
-from twisted.web import static, html, server, distrib
-from twisted.web.error import NoResource
[...1705 lines suppressed...]
-        else:
-            control = None
-        change_svc = self.parent.change_svc
-        sr = StatusResource(status, control, change_svc, self.categories,
-                            self.css)
-        sr.favicon = self.favicon
-        sr.robots_txt = self.robots_txt
-        self.site = server.Site(sr)
+# compatibility wrapper. This is currently the preferred place for master.cfg
+# to import from.
 
-        if self.http_port is not None:
-            s = strports.service(self.http_port, self.site)
-            s.setServiceParent(self)
-        if self.distrib_port is not None:
-            f = pb.PBServerFactory(distrib.ResourcePublisher(self.site))
-            s = strports.service(self.distrib_port, f)
-            s.setServiceParent(self)
+from buildbot.status.web.waterfall import Waterfall
+_hush_pyflakes = [Waterfall]

Index: mail.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/mail.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- mail.py	15 Apr 2007 01:28:47 -0000	1.34
+++ mail.py	17 Apr 2007 06:38:51 -0000	1.35
@@ -61,7 +61,7 @@
 
     def __init__(self, fromaddr, mode="all", categories=None, builders=None,
                  addLogs=False, relayhost="localhost",
-                 subject="buildbot %(result)s in %(builder)s",
+                 subject="buildbot %(result)s in %(projectName)s on %(builder)s",
                  lookup=None, extraRecipients=[],
                  sendToInterestedUsers=True):
         """
@@ -214,13 +214,15 @@
         return self.buildMessage(name, build, results)
 
     def buildMessage(self, name, build, results):
+        projectName = self.status.getProjectName()
         text = ""
         if self.mode == "all":
-            text += "The Buildbot has finished a build of %s.\n" % name
+            text += "The Buildbot has finished a build"
         elif self.mode == "failing":
-            text += "The Buildbot has detected a failed build of %s.\n" % name
+            text += "The Buildbot has detected a failed build"
         else:
-            text += "The Buildbot has detected a new failure of %s.\n" % name
+            text += "The Buildbot has detected a new failure"
+        text += " of %s on %s.\n" % (name, projectName)
         buildurl = self.status.getURLForThing(build)
         if buildurl:
             text += "Full details are available at:\n %s\n" % buildurl
@@ -304,6 +306,7 @@
 
         m['Date'] = formatdate(localtime=True)
         m['Subject'] = self.subject % { 'result': res,
+                                        'projectName': projectName,
                                         'builder': name,
                                         }
         m['From'] = self.fromaddr