[Buildbot-commits] buildbot/buildbot/changes mail.py,1.21,1.22

[Brian Warner]

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

Modified Files:
	mail.py 
Log Message:
[project @ fix the bonsai mail parser]

Original author: warner at lothar.com
Date: 2006-09-25 06:50:24

Index: mail.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/mail.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mail.py	6 Sep 2006 00:41:54 -0000	1.21
+++ mail.py	25 Sep 2006 06:51:36 -0000	1.22
@@ -229,7 +229,7 @@
 # actually make a new directory part of the build process. That's my story
 # and I'm sticking to it.
 
-def parseBonsaiMail(self, fd, prefix=None):
+def parseBonsaiMail(self, fd, prefix=None, sep="/"):
     """Parse mail sent by the Bonsai cvs loginfo script."""
 
     msg = Message(fd)
@@ -274,6 +274,8 @@
         if module and file:
             path = "%s/%s" % (module, file)
             files.append(path)
+        sticky = items[7]
+        branch = items[8]
 
     # if no files changed, return nothing
     if not files:
@@ -289,7 +291,8 @@
     comments = comments.rstrip() + "\n"
 
     # return buildbot Change object
-    return changes.Change(who, files, comments, when=timestamp)
+    return changes.Change(who, files, comments, when=timestamp, branch=branch)
+
 
 
 class MaildirSource(maildirtwisted.MaildirTwisted, base.ChangeSource):