Skip to content

Commit

Permalink
first, get properties from changes, then from the scheduler. This way…
Browse files Browse the repository at this point in the history
…, the scheduler can overwrite source properties (fixes buildbot#809)
  • Loading branch information
Pike committed May 3, 2010
1 parent 9061ba5 commit f6fe645
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions buildbot/process/base.py
Expand Up @@ -280,15 +280,15 @@ def setupProperties(self):
buildmaster = self.builder.botmaster.parent
props.updateFromProperties(buildmaster.properties)

# get any properties from requests (this is the path through
# which schedulers will send us properties)
for rq in self.requests:
props.updateFromProperties(rq.properties)

# and finally, from the SourceStamp, which has properties via Change
# from the SourceStamp, which has properties via Change
for change in self.source.changes:
props.updateFromProperties(change.properties)

# and finally, get any properties from requests (this is the path
# through which schedulers will send us properties)
for rq in self.requests:
props.updateFromProperties(rq.properties)

# now set some properties of our own, corresponding to the
# build itself
props.setProperty("buildername", self.builder.name, "Build")
Expand Down

0 comments on commit f6fe645

Please sign in to comment.