[Buildbot-commits] buildbot/buildbot/scripts runner.py, 1.61, 1.62 tryclient.py, 1.21, 1.22

[Brian Warner]

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

Modified Files:
	runner.py tryclient.py 
Log Message:
[project @ #124:remove-custom-props.patch]
Remove custom properties, which are now largely redundant, and on which the
properties interface was modeled.

Original author: dustin at v.igoro.us
Date: 2008-04-13 19:55:26+00:00

Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- runner.py	22 May 2008 22:12:05 -0000	1.61
+++ runner.py	22 May 2008 22:13:22 -0000	1.62
@@ -763,8 +763,8 @@
 
         ["builder", "b", None,
          "Run the trial build on this Builder. Can be used multiple times."],
-        ["customproperties", None, None,
-         "A set of custom properties made available in the build environment, format:prop=value,propb=valueb..."],
+        ["properties", None, None,
+         "A set of properties made available in the build environment, format:prop=value,propb=valueb..."],
         ]
 
     optFlags = [
@@ -774,21 +774,20 @@
     def __init__(self):
         super(TryOptions, self).__init__()
         self['builders'] = []
-        self['custom_props'] = {}
+        self['properties'] = {}
 
     def opt_builder(self, option):
         self['builders'].append(option)
 
-    def opt_customproperties(self, option):
-        # We need to split the value of this option into a dictionary of custom
-        # properties
-        custom_props = {}
+    def opt_properties(self, option):
+        # We need to split the value of this option into a dictionary of properties
+        properties = {}
         propertylist = option.split(",")
         for i in range(0,len(propertylist)):
             print propertylist[i]
             splitproperty = propertylist[i].split("=")
-            custom_props[splitproperty[0]] = splitproperty[1]
-        self['custom_props'] = custom_props
+            properties[splitproperty[0]] = splitproperty[1]
+        self['properties'] = properties
 
     def opt_patchlevel(self, option):
         self['patchlevel'] = int(option)

Index: tryclient.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/tryclient.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- tryclient.py	22 May 2008 22:12:05 -0000	1.21
+++ tryclient.py	22 May 2008 22:13:22 -0000	1.22
@@ -448,7 +448,7 @@
                               ss.revision,
                               ss.patch,
                               self.builderNames,
-                              self.config.get('custom_props', {}))
+                              self.config.get('properties', {}))
         d.addCallback(self._deliverJob_pb2)
         return d
     def _deliverJob_pb2(self, status):