diff options
Diffstat (limited to 'src/flufigut.py')
| -rwxr-xr-x | src/flufigut.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index d2ef659..0eabdf8 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -368,15 +368,15 @@ if error != 0: # import shutil -shutil.rmtree('output', ignore_errors=True) +shutil.rmtree('output/%s' % output_format, ignore_errors=True) -env = Environment(loader=FileSystemLoader('../templates/%s/' % (globals['templates'])), line_statement_prefix = '%%') +env = Environment(loader=FileSystemLoader('../templates/%s/%s/' % (output_format,globals['templates'])), line_statement_prefix = '%%') print "generating planet '%s/%s'" % (globals['manager']['machine'], globals['name']) template = env.get_template('planet.xml') planet = template.render(globals=globals, atmosphere=atmosphere, flow=flow) -dir = 'output/%s/managers/%s/' % (globals['manager']['machine'], globals['name']) +dir = 'output/%s/%s/managers/%s/' % (output_format, globals['manager']['machine'], globals['name']) if not os.path.exists(dir): os.makedirs(dir) f = open('%s/planet.xml' % (dir), 'w') @@ -384,7 +384,7 @@ f.write(planet.encode("utf8")) f.write('\n') f.close() -passwd = open('output/%s/%s.passwd' % (globals['manager']['machine'], globals['name']), 'w') +passwd = open('output/%s/%s/%s.passwd' % (output_format, globals['manager']['machine'], globals['name']), 'w') port = 9000 for w in worker: @@ -400,7 +400,7 @@ for w in worker: ports = "%i-%i" % (port, port+1) port+=2 workerconf = template.render(globals=globals, name=w, password=password, portrange=ports) - dir = 'output/%s/workers' % machine + dir = 'output/%s/%s/workers' % (output_format, machine) if not os.path.exists(dir): os.makedirs(dir) f = open('%s/%s-%s.xml' % (dir, globals['name'], w), 'w') |