Ticket #760: buildbot-0.7.12.slavebuilddir-fix.patch

File buildbot-0.7.12.slavebuilddir-fix.patch, 1.6 KB (added by sascha_silbe, 2 years ago)

make slavebuilddir default to builddir setting, as documented

  • build/lib.linux-x86_64-2.6/buildbot/process/builder.py 

    diff -ur buildbot-0.7.12.orig/build/lib.linux-x86_64-2.6/buildbot/process/builder.py buildbot-0.7.12/build/lib.linux-x86_64-2.6/buildbot/process/builder.py
    old new  
    353353        if setup.has_key('slavenames'): 
    354354            self.slavenames.extend(setup['slavenames']) 
    355355        self.builddir = setup['builddir'] 
    356         self.slavebuilddir = setup['slavebuilddir'] 
     356        self.slavebuilddir = setup.get('slavebuilddir', self.builddir) 
    357357        self.buildFactory = setup['factory'] 
    358358        self.nextSlave = setup.get('nextSlave') 
    359359        if self.nextSlave is not None and not callable(self.nextSlave): 

  • buildbot/process/builder.py 

    diff -ur buildbot-0.7.12.orig/buildbot/process/builder.py buildbot-0.7.12/buildbot/process/builder.py
    old new  
    353353        if setup.has_key('slavenames'): 
    354354            self.slavenames.extend(setup['slavenames']) 
    355355        self.builddir = setup['builddir'] 
    356         self.slavebuilddir = setup['slavebuilddir'] 
     356        self.slavebuilddir = setup.get('slavebuilddir', self.builddir) 
    357357        self.buildFactory = setup['factory'] 
    358358        self.nextSlave = setup.get('nextSlave') 
    359359        if self.nextSlave is not None and not callable(self.nextSlave):