[Buildbot-commits] buildbot/buildbot/status html.py,1.59,1.60

[Brian Warner]

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

Modified Files:
	html.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-133
Creator:  Brian Warner <warner at monolith.lothar.com>

fix phase=0 rendering, remove debug message

	* buildbot/status/html.py (WaterfallStatusResource.body): fix
	exception in phase=0 rendering
	* buildbot/test/test_web.py (WebTest.test_waterfall): test it

	* buildbot/changes/dnotify.py (DNotify.__init__): remove debug msg


Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- html.py	3 May 2005 04:34:02 -0000	1.59
+++ html.py	4 May 2005 07:04:15 -0000	1.60
@@ -878,7 +878,8 @@
         (changeNames, builderNames, timestamps, eventGrid, sourceEvents) = \
                       self.buildGrid(request, builders)
         if phase == 0:
-            return self.phase0(request, sourceNames, timestamps, eventGrid)
+            return self.phase0(request, (changeNames + builderNames),
+                               timestamps, eventGrid)
         # start the table: top-header material
         data = "<table class=\"table\" border=\"0\" cellspacing=\"0\">\n"
         #data = "<table frame=\"rhs\" rules=\"all\" class=\"table\">\n"
@@ -1128,7 +1129,7 @@
                     data += "<b>%s</b><br />\n" % sourceNames[c]
                     for e in row[c]:
                         log.msg("Event", r, c, sourceNames[c], e.getText())
-                        lognames = [log.getName() for log in e.getLogs()]
+                        lognames = [loog.getName() for loog in e.getLogs()]
                         data += "%s: %s: %s %s<br />" % (e.getText(),
                                                          e.getTimes()[0],
                                                          e.getColor(),