# HG changeset patch # User Jeff Hammel # Date 1294429793 28800 # Node ID 848569b7f91a9c57c3aadab5bd82b084c53eaa72 # Parent fe1dc9e43d09671d81a5fa2ddd7d7961836588e1 use subdirectories for the master and slave diff -r fe1dc9e43d09 -r 848569b7f91a autobot/template.py --- a/autobot/template.py Fri Jan 07 11:29:21 2011 -0800 +++ b/autobot/template.py Fri Jan 07 11:49:53 2011 -0800 @@ -4,6 +4,7 @@ templates for the A*Team's buildbot """ +import os import sys from makeitso.cli import MakeItSoCLI from makeitso.template import MakeItSoTemplate @@ -12,7 +13,7 @@ class AutobotMasterTemplate(MakeItSoTemplate): name = 'autobot-master' description = 'template for the autotools buildbot master' - templates = ['master'] + templates = [os.path.join('template', 'master')] vars = [Variable('slave', 'buildslave name', 'slave'), Variable('passwd', 'buildslave password', default='passwd'), Variable('slaveport', 'port to talk to slaves on', default=9010), @@ -24,7 +25,7 @@ class AutobotSlaveTemplate(MakeItSoTemplate): name = 'autobot-slave' description = 'template for the autotools buildbot slave' - templates = ['slave'] + templates = [os.path.join('template', 'slave')] look = True def main(args=sys.argv[1:]):