[Buildbot-commits] buildbot ChangeLog,1.558,1.559

[Brian Warner]

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

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

fix the multiple-equivalent-Lock-instances bug on config-file reload

	* buildbot/locks.py: fix the problem in which loading a master.cfg
	file that changes some Builders (but not all of them) can result
	in having multiple copies of the same Lock. Now, the real Locks
	are kept in a table inside the BotMaster, and the Builders/Steps
	use "LockIDs", which are still instances of MasterLock and
	SlaveLock. The real Locks are instances of the new RealMasterLock
	and RealSlaveLock classes.
	* buildbot/master.py (BotMaster.getLockByID): new method to
	convert LockIDs into real Locks.
	* buildbot/process/base.py (Build.startBuild): convert LockIDs
	into real Locks before building
	* buildbot/process/step.py (BuildStep.startStep): same
	* buildbot/test/test_locks.py (Locks.testLock1a): add a test which
	exercises the problem


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -d -r1.558 -r1.559
--- ChangeLog	26 Nov 2005 02:09:24 -0000	1.558
+++ ChangeLog	26 Nov 2005 02:14:31 -0000	1.559
@@ -1,5 +1,21 @@
 2005-11-25  Brian Warner  <warner at lothar.com>
 
+	* buildbot/locks.py: fix the problem in which loading a master.cfg
+	file that changes some Builders (but not all of them) can result
+	in having multiple copies of the same Lock. Now, the real Locks
+	are kept in a table inside the BotMaster, and the Builders/Steps
+	use "LockIDs", which are still instances of MasterLock and
+	SlaveLock. The real Locks are instances of the new RealMasterLock
+	and RealSlaveLock classes.
+	* buildbot/master.py (BotMaster.getLockByID): new method to
+	convert LockIDs into real Locks.
+	* buildbot/process/base.py (Build.startBuild): convert LockIDs
+	into real Locks before building
+	* buildbot/process/step.py (BuildStep.startStep): same
+	* buildbot/test/test_locks.py (Locks.testLock1a): add a test which
+	exercises the problem
+
+
 	* docs/buildbot.texinfo (Scheduler Types): give a few hints about
 	what Schedulers are available