# HG changeset patch # User Jeff Hammel # Date 1294784619 28800 # Node ID d033843da35a732a89edd06d7a8bc513119b094d # Parent 4e5fe6883fd9230ef3606e6381dadb5376b6c4bd templates work again maybe diff -r 4e5fe6883fd9 -r d033843da35a autobot/template.py --- a/autobot/template.py Tue Jan 11 14:03:01 2011 -0800 +++ b/autobot/template.py Tue Jan 11 14:23:39 2011 -0800 @@ -41,7 +41,7 @@ Variable('slaveport', 'port to talk to slaves on', default=9010, cast=int), Variable('htmlport', 'port for waterfall display', default=8010, cast=int)] - def pre(self, variables): + def pre(self, variables, output): factory = variables.get('factories') if factory: assert(set(factory).issubset(factories.keys())), 'Factory must be one of: ' % ', '.join(factories.keys()) @@ -84,8 +84,8 @@ call(command) - def post(self, variables): - self.create(self.output, variables) + def post(self, variables, output): + self.create(output, variables) class AutobotTemplate(AutobotMasterTemplate, AutobotSlaveTemplate): @@ -95,9 +95,9 @@ vars = assemble(AutobotMasterTemplate, AutobotSlaveTemplate) vars.append(Variable('debug', default=True, cast='eval')) - def post(self, variables): - AutobotMasterTemplate.create(self, os.path.join(self.output, 'master'), variables) - AutobotSlaveTemplate.create(self, os.path.join(self.output, 'slave'), variables) + def post(self, variables, output): + AutobotMasterTemplate.create(self, os.path.join(output, 'master'), variables) + AutobotSlaveTemplate.create(self, os.path.join(output, 'slave'), variables) class ProjectTemplate(MakeItSoTemplate):