[Buildbot-commits] buildbot/buildbot/changes svnpoller.py,1.5,1.6

[Brian Warner]

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

Modified Files:
	svnpoller.py 
Log Message:
[project @ svnpoller: tolerate SVN failures and allow the poll to continue. Closes #34.]

Original author: warner at lothar.com
Date: 2007-06-17 05:53:09+00:00

Index: svnpoller.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/svnpoller.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- svnpoller.py	12 Dec 2006 03:24:03 -0000	1.5
+++ svnpoller.py	17 Jun 2007 21:10:39 -0000	1.6
@@ -255,7 +255,7 @@
         d.addCallback(self.get_new_logentries)
         d.addCallback(self.create_changes)
         d.addCallback(self.submit_changes)
-        d.addBoth(self.finished)
+        d.addCallbacks(self.finished_ok, self.finished_failure)
         return d
 
     def getProcessOutput(self, args):
@@ -436,9 +436,16 @@
         for c in changes:
             self.parent.addChange(c)
 
-    def finished(self, res):
+    def finished_ok(self, res):
         log.msg("SVNPoller finished polling")
         dbgMsg('_finished : %s' % res)
         assert self.working
         self.working = False
         return res
+
+    def finished_failure(self, f):
+        log.msg("SVNPoller failed")
+        dbgMsg('_finished : %s' % f)
+        assert self.working
+        self.working = False
+        return None # eat the failure