[Buildbot-commits] buildbot/buildbot/process base.py, 1.68, 1.69 step.py, 1.99, 1.100

[Brian Warner]

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

Modified Files:
	base.py step.py 
Log Message:
[project @ locks: can now have multiple simultaneous owners. fixes SF#1434997]

Original author: warner at lothar.com
Date: 2006-08-24 10:03:52

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- base.py	6 Aug 2006 20:05:21 -0000	1.68
+++ base.py	24 Aug 2006 10:05:16 -0000	1.69
@@ -332,7 +332,7 @@
         for lock in self.locks:
             if not lock.isAvailable():
                 log.msg("Build %s waiting for lock %s" % (self, lock))
-                d = lock.waitUntilAvailable(self)
+                d = lock.waitUntilMaybeAvailable(self)
                 d.addCallback(self.acquireLocks)
                 return d
         # all locks are available, claim them all

Index: step.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step.py,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- step.py	21 Aug 2006 00:43:20 -0000	1.99
+++ step.py	24 Aug 2006 10:05:16 -0000	1.100
@@ -661,7 +661,7 @@
         for lock in self.locks:
             if not lock.isAvailable():
                 log.msg("step %s waiting for lock %s" % (self, lock))
-                d = lock.waitUntilAvailable(self)
+                d = lock.waitUntilMaybeAvailable(self)
                 d.addCallback(self.acquireLocks)
                 return d
         # all locks are available, claim them all