[Buildbot-commits] buildbot/buildbot master.py,1.77,1.78

[Brian Warner]

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

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

make sure SlaveLock('name') and MasterLock('name') are distinct

	* buildbot/master.py (BuildMaster.loadConfig): give a better error
	message when schedulers use unknown builders

	* buildbot/process/builder.py (Builder.compareToSetup): make sure
	SlaveLock('name') and MasterLock('name') are distinct


Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- master.py	20 Jul 2005 05:07:46 -0000	1.77
+++ master.py	20 Jul 2005 05:36:55 -0000	1.78
@@ -746,7 +746,8 @@
 
         for s in schedulers:
             for b in s.listBuilderNames():
-                assert b in buildernames
+                assert b in buildernames, \
+                       "%s uses unknown builder %s" % (s, b)
 
         # assert that all locks used by the Builds and their Steps are
         # uniquely named.