[Buildbot-commits] buildbot/buildbot/status tinderbox.py,1.6,1.7

[Brian Warner]

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

Modified Files:
	tinderbox.py 
Log Message:
[project @ tinderbox: add errorparser= arg to TinderboxMailNotifier. Closes #94.]

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

Index: tinderbox.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/tinderbox.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tinderbox.py	29 Sep 2007 22:39:22 -0000	1.6
+++ tinderbox.py	29 Sep 2007 22:58:15 -0000	1.7
@@ -33,12 +33,12 @@
 
     compare_attrs = ["extraRecipients", "fromaddr", "categories", "builders",
                      "addLogs", "relayhost", "subject", "binaryURL", "tree",
-                     "logCompression"]
+                     "logCompression", "errorparser"]
 
     def __init__(self, fromaddr, tree, extraRecipients,
                  categories=None, builders=None, relayhost="localhost",
                  subject="buildbot %(result)s in %(builder)s", binaryURL="",
-                 logCompression=""):
+                 logCompression="", errorparser="unix"):
         """
         @type  fromaddr: string
         @param fromaddr: the email address to be used in the 'From' header.
@@ -82,6 +82,11 @@
         @param logCompression: The type of compression to use on the log.
                                Valid options are"bzip2" and "gzip". gzip is
                                only known to work on Python 2.4 and above.
+
+        @type  errorparser: string
+        @param errorparser: The error parser that the Tinderbox server
+                            should use when scanning the log file.
+                            Default is "unix".
         """
 
         mail.MailNotifier.__init__(self, fromaddr, categories=categories,
@@ -92,6 +97,7 @@
         self.tree = tree
         self.binaryURL = binaryURL
         self.logCompression = logCompression
+        self.errorparser = errorparser
 
     def buildStarted(self, name, build):
         builder = build.getBuilder()
@@ -130,7 +136,7 @@
         text += "\n";
 
         text += "%s build: %s\n" % (t, name)
-        text += "%s errorparser: unix\n" % t # always use the unix errorparser
+        text += "%s errorparser: %s\n" % (t, self.errorparser)
 
         # if the build just started...
         if results == "building":