[Buildbot-commits] buildbot/buildbot/changes bonsaipoller.py, 1.6, 1.7

[Brian Warner]

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

Modified Files:
	bonsaipoller.py 
Log Message:
[project @ bonsaipoller: tolerate empty log messages. Closes #90.]

Original author: warner at lothar.com
Date: 2007-09-29 22:51:06+00:00

Index: bonsaipoller.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/bonsaipoller.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bonsaipoller.py	29 Sep 2007 20:47:23 -0000	1.6
+++ bonsaipoller.py	29 Sep 2007 22:51:40 -0000	1.7
@@ -100,8 +100,16 @@
                     pass
                 except InvalidResultError:
                     raise
-                nodes.append(CiNode(self._getLog(), self._getWho(),
-                                    self._getDate(), files))
+                cinode = CiNode(self._getLog(), self._getWho(),
+                                self._getDate(), files)
+                # hack around bonsai xml output bug for empty check-in comments
+                if not cinode.log and nodes and \
+                        not nodes[-1].log and \
+                        cinode.who == nodes[-1].who and \
+                        cinode.date == nodes[-1].date:
+                    nodes[-1].files += cinode.files
+                else:
+                    nodes.append(cinode)
 
         except NoMoreCiNodes:
             pass