[Buildbot-commits] [Buildbot] #2033: MergeRequest_fn brocken in 1.8.4 branch

[Buildbot]

#2033: MergeRequest_fn brocken in 1.8.4 branch
----------------------+-----------------------
Reporter:  tardyp     |      Owner:
    Type:  undecided  |     Status:  new
Priority:  major      |  Milestone:  undecided
 Version:  0.8.4p1    |   Keywords:
----------------------+-----------------------
 I got this trace since I rebased yesterday to the latest version of 1.8.4

 I dont have c['MergeRequest'] in my config...


 2011-07-01 15:29:47+0200 [-] in maybeStartBuild for <Builder ''acs-
 mfld_cdk'' at 155602732>
         Traceback (most recent call last):
           File "/usr/local/lib/python2.6/dist-
 packages/Twisted-11.0.0-py2.6-linux-i686.egg/twisted/internet/defer.py",
 line 542, in _runCallbacks
             current.result = callback(current.result, *args, **kw)
           File "/usr/local/lib/python2.6/dist-
 packages/Twisted-11.0.0-py2.6-linux-i686.egg/twisted/internet/defer.py",
 line 891, in gotResult
             _deferGenerator(g, deferred)
           File "/usr/local/lib/python2.6/dist-
 packages/Twisted-11.0.0-py2.6-linux-i686.egg/twisted/internet/defer.py",
 line 866, in _deferGenerator
             result = g.next()
           File "/buildbot/buildbot/master/buildbot/process/builder.py",
 line 810, in _mergeRequests
             defer.maybeDeferred(lambda :
         --- <exception caught here> ---
           File "/usr/local/lib/python2.6/dist-
 packages/Twisted-11.0.0-py2.6-linux-i686.egg/twisted/internet/defer.py",
 line 133, in maybeDeferred
             result = f(*args, **kw)
           File "/buildbot/buildbot/master/buildbot/process/builder.py",
 line 811, in <lambda>
             mergeRequests_fn(self, breq_object, other_breq_object)))
         exceptions.TypeError: unbound method canBeMergedWith() must be
 called with BuildRequest instance as first argument (got Builder instance
 instead)

-- 
Ticket URL: <http://trac.buildbot.net/ticket/2033>
Buildbot <http://buildbot.net/>
Buildbot: build/test automation