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

[Brian Warner]

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

Modified Files:
	master.py 
Log Message:
[project @ #87:customprops-fix-debugclient.patch]
Patch by gward to teach DebugPerspective? and debugclient about custom
build properties

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

Index: master.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/master.py,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- master.py	22 May 2008 22:12:05 -0000	1.112
+++ master.py	22 May 2008 22:12:10 -0000	1.113
@@ -227,11 +227,19 @@
     def detached(self, mind):
         pass
 
-    def perspective_requestBuild(self, buildername, reason, branch, revision):
+    def perspective_requestBuild(self, buildername, reason, branch, revision, custom_props):
+        assert isinstance(custom_props, dict), \
+               "custom_props must be a dict (not %r)" % (custom_props,)
+
+        # 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)
         ss = SourceStamp(branch, revision)
-        br = BuildRequest(reason, ss, buildername)
+        br = BuildRequest(reason, ss, builderName=buildername, custom_props=custom_props)
         bc.requestBuild(br)
 
     def perspective_pingBuilder(self, buildername):