[Buildbot-commits] buildbot/buildbot/steps trigger.py,1.4,1.5

[Brian Warner]

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

Modified Files:
	trigger.py 
Log Message:
[project @ #124:scheduler-properties.patch]
Arrange for properties to come down from schedulers, via BuildStep and
BuildRequest objects.  custom_props are still present, in parallel, but
will go eventually. Triggered builds no longer propagate custom props.

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

Index: trigger.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/steps/trigger.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- trigger.py	22 May 2008 22:12:05 -0000	1.4
+++ trigger.py	22 May 2008 22:13:06 -0000	1.5
@@ -62,7 +62,6 @@
                 pass
             if got:
                 ss = ss.getAbsoluteSourceStamp(got)
-        custom_props = self.build.getCustomProperties()
         # (is there an easier way to find the BuildMaster?)
         all_schedulers = self.build.builder.botmaster.parent.allSchedulers()
         all_schedulers = dict([(sch.name, sch) for sch in all_schedulers])
@@ -77,7 +76,7 @@
             if all_schedulers.has_key(scheduler):
                 sch = all_schedulers[scheduler]
                 if isinstance(sch, Triggerable):
-                    dl.append(sch.trigger(ss, custom_props))
+                    dl.append(sch.trigger(ss, {})) # TODO: copy some properties, set the rest
                     triggered_schedulers.append(scheduler)
                 else:
                     unknown_schedulers.append(scheduler)