[Buildbot-commits] buildbot/buildbot master.py,1.93,1.94

[Brian Warner]

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

Modified Files:
	master.py 
Log Message:
[project @ check for duplicate Scheduler names when loading the config file]

Original author: warner at lothar.com
Date: 2006-07-24 22:01:13

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- master.py	16 Jul 2006 00:59:05 -0000	1.93
+++ master.py	24 Jul 2006 22:09:20 -0000	1.94
@@ -759,10 +759,20 @@
                                  % (b['name'], b['builddir']))
             dirnames.append(b['builddir'])
 
+        schedulernames = []
         for s in schedulers:
             for b in s.listBuilderNames():
                 assert b in buildernames, \
                        "%s uses unknown builder %s" % (s, b)
+            if s.name in schedulernames:
+                # TODO: schedulers share a namespace with other Service
+                # children of the BuildMaster node, like status plugins, the
+                # Manhole, the ChangeMaster, and the BotMaster (although most
+                # of these don't have names)
+                msg = ("Schedulers must have unique names, but "
+                       "'%s' was a duplicate" + s.name)
+                raise ValueError(msg)
+            schedulernames.append(s.name)
 
         # assert that all locks used by the Builds and their Steps are
         # uniquely named.