[Buildbot-commits] buildbot/buildbot/status html.py, 1.98, 1.99 mail.py, 1.33, 1.34

[Brian Warner]

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

Modified Files:
	html.py mail.py 
Log Message:
[project @ web-parts: start rearranging web status files]

Original author: warner at lothar.com

Date: 2007-02-27 20:33:22+00:00

Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- html.py	4 Mar 2007 07:32:47 -0000	1.98
+++ html.py	15 Apr 2007 01:28:47 -0000	1.99
@@ -1,7 +1,1731 @@
-#! /usr/bin/python
+# -*- test-case-name: buildbot.test.test_web -*-
 
-# compatibility wrapper. This is currently the preferred place for master.cfg
-# to import from.
+from __future__ import generators
 
-from buildbot.status.web.waterfall import Waterfall
-_hush_pyflakes = [Waterfall]
+from twisted.python import log, components
+import urllib, re
[...1705 lines suppressed...]
+    def setup(self):
+        status = self.parent.getStatus()
+        if self.allowForce:
+            control = interfaces.IControl(self.parent)
+        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)
+
+        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)

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