[Buildbot-commits] [Buildbot] #2555: buildbot forced build always uses the default mergerequest function

[Buildbot trac]

#2555: buildbot forced build always uses the default mergerequest function
--------------------+------------------------
Reporter:  brendan  |       Owner:
    Type:  defect   |      Status:  new
Priority:  major    |   Milestone:  undecided
 Version:  0.8.5    |  Resolution:
Keywords:           |
--------------------+------------------------

Comment (by dustin):

 Ah, it's a bug in the !BuilderConfig stuff.  This should fix it:
 {{{
 #!diff
 diff --git a/master/buildbot/config.py b/master/buildbot/config.py
 index d9e61fc..b6ec5c7 100644
 --- a/master/buildbot/config.py
 +++ b/master/buildbot/config.py
 @@ -121,6 +121,6 @@ class BuilderConfig:
              rv['env'] = self.env
          if self.properties:
              rv['properties'] = self.properties
 -        if self.mergeRequests:
 +        if self.mergeRequests is not None:
              rv['mergeRequests'] = self.mergeRequests
          return rv
 }}}

-- 
Ticket URL: <http://trac.buildbot.net/ticket/2555#comment:1>
Buildbot <http://buildbot.net/>
Buildbot: build/test automation