[Buildbot-commits] buildbot/buildbot/process base.py,1.56,1.57

[Brian Warner]

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

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

remove references to old 'interlock' module

	* buildbot/master.py (BuildMaster): remove references to old
	'interlock' module, this caused a bunch of post-merge test
	failures
	* buildbot/test/test_config.py: same
	* buildbot/process/base.py (Build): same


Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- base.py	19 Jul 2005 23:11:58 -0000	1.56
+++ base.py	19 Jul 2005 23:23:21 -0000	1.57
@@ -174,7 +174,6 @@
         self.source = requests[0].mergeWith(requests[1:])
         self.reason = requests[0].mergeReasons(requests[1:])
 
-        #self.interlocks = []
         #self.abandoned = False
 
         self.progress = None
@@ -209,36 +208,6 @@
                 havedirs = 1
         return files
 
-    def OFFcheckInterlocks(self, interlocks):
-        assert interlocks
-        # Build.interlocks is a list of the ones we are waiting for. As each
-        # deferred fires, we remove one from the list. When the last one
-        # fires, the build is started. When the first one fails, the build
-        # is abandoned.
-
-        # This could be done with a DeferredList, but we track the actual
-        # Interlocks so we can provide better status information (i.e.
-        # *which* interlocks the build is waiting for).
-
-        self.interlocks = interlocks[:]
-        for interlock in interlocks:
-            d = interlock.hasPassed(self.maxChangeNumber)
-            d.addCallback(self.interlockDone, interlock)
-        # wait for all of them to pass
-
-    def OFFinterlockDone(self, passed, interlock):
-        # one interlock has finished
-        self.interlocks.remove(interlock)
-        if self.abandoned:
-            return
-        if passed and not self.interlocks:
-            # that was the last holdup, we are now .buildable
-            self.builder.interlockPassed(self)
-        else:
-            # failed, do failmerge
-            self.abandoned = True
-            self.builder.interlockFailed(self)
-
     def __repr__(self):
         return "<Build %s>" % (self.builder.name)