# HG changeset patch # User Jeff Hammel # Date 1296837053 28800 # Node ID dc56c0de73bca16ebe6b9d52cbb1cfbc508c6ef1 # Parent 3e5d1c1e302d2c3b3393dc4f2ff8cd9e47bc7b69 name the slave to the os by default diff -r 3e5d1c1e302d -r dc56c0de73bc autobot/template.py --- a/autobot/template.py Fri Feb 04 08:28:21 2011 -0800 +++ b/autobot/template.py Fri Feb 04 08:30:53 2011 -0800 @@ -46,7 +46,7 @@ name = 'autobot-master' description = 'template for the autotools buildbot master' templates = [os.path.join('template', 'master')] - vars = [Variable('slave', 'buildslave name', 'slave'), + vars = [Variable('slave', 'buildslave name', os_type or 'slave'), Variable('os', 'buildslave os (win, mac, linux)', os_type), Variable('passwd', 'buildslave password', default='passwd'), Variable('slaveport', 'port to talk to slaves on', default=9010, cast=int), @@ -85,7 +85,7 @@ description = 'template for the autotools buildbot slave' templates = [os.path.join('template', 'slave')] vars = [Variable('master', 'host of the master', default='localhost'), - Variable('slave', 'buildslave name', 'slave'), + Variable('slave', 'buildslave name', os_type or 'slave'), Variable('passwd', 'buildslave password', default='passwd'), Variable('slaveport', 'port to talk to slaves on', default=9010)]