[Buildbot-commits] buildbot/buildbot/process builder.py,1.27,1.28

[Brian Warner]

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

Modified Files:
	builder.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: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/builder.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- builder.py	19 Jul 2005 23:11:58 -0000	1.27
+++ builder.py	20 Jul 2005 05:36:56 -0000	1.28
@@ -243,8 +243,10 @@
                          % (self.builddir, setup['builddir']))
         if setup['factory'] != self.buildFactory: # compare objects
             diffs.append('factory changed')
-        oldlocks = [lock.name for lock in setup.get('locks',[])]
-        newlocks = [lock.name for lock in self.locks]
+        oldlocks = [(lock.__class__, lock.name)
+                    for lock in setup.get('locks',[])]
+        newlocks = [(lock.__class__, lock.name)
+                    for lock in self.locks]
         if oldlocks != newlocks:
             diffs.append('locks changed from %s to %s' % (oldlocks, newlocks))
         return diffs