[Buildbot-commits] buildbot/buildbot master.py,1.113,1.114

[Brian Warner]

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

Modified Files:
	master.py 
Log Message:
[project @ #124:remove-customBuildProperties-unused.patch]
Remove unused and undocumented customBuildProperties config.
This did not allow users to specify global properties; rather, it
specified descriptions for properties that were not used anywhere in
the codebase.

Original author: dustin at v.igoro.us
Date: 2008-04-12 05:50:01+00:00

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- master.py	22 May 2008 22:12:10 -0000	1.113
+++ master.py	22 May 2008 22:12:52 -0000	1.114
@@ -233,8 +233,6 @@
 
         # Provide default values for any custom build properties the
         # client did not send.
-        for propertyDict in (self.master.customBuildProperties or []):
-            custom_props.setdefault(propertyDict['propertyName'], "")
 
         c = interfaces.IControl(self.master)
         bc = c.getBuilder(buildername)
@@ -347,7 +345,6 @@
     projectURL = None
     buildbotURL = None
     change_svc = None
-    customBuildProperties = None
 
     def __init__(self, basedir, configFileName="master.cfg"):
         service.MultiService.__init__(self)
@@ -503,7 +500,6 @@
                       "schedulers", "builders",
                       "slavePortnum", "debugPassword", "manhole",
                       "status", "projectName", "projectURL", "buildbotURL",
-                      "customBuildProperties"
                       )
         for k in config.keys():
             if k not in known_keys:
@@ -531,7 +527,6 @@
             projectName = config.get('projectName')
             projectURL = config.get('projectURL')
             buildbotURL = config.get('buildbotURL')
-            customBuildProperties = config.get('customBuildProperties')
 
         except KeyError, e:
             log.msg("config dictionary is missing a required parameter")
@@ -677,7 +672,6 @@
         self.projectName = projectName
         self.projectURL = projectURL
         self.buildbotURL = buildbotURL
-        self.customBuildProperties = customBuildProperties
 
         # self.slaves: Disconnect any that were attached and removed from the
         # list. Update self.checker with the new list of passwords, including