using planet name for output dir

1 files changed, 4 insertions, 4 deletions

diff --git a/src/flufigut.py b/src/flufigut.py
index 4634ccc..2372fc8 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -373,7 +373,7 @@ if output_format == 'flumotion':
   #
 
   import shutil
-  shutil.rmtree('output/%s' % output_format, ignore_errors=True)
+  shutil.rmtree('%s/%s' % (globals['name'], output_format), ignore_errors=True)
 
   env = Environment(loader=FileSystemLoader('../templates/%s/%s/' % (output_format,globals['templates'])), line_statement_prefix = '%%')
 
@@ -381,7 +381,7 @@ if output_format == 'flumotion':
   template = env.get_template('planet.xml')
   planet = template.render(globals=globals, atmosphere=atmosphere, flow=flow)
 
-  dir = 'output/%s/%s/managers/%s/' % (output_format, globals['manager']['machine'], globals['name'])
+  dir = '%s/%s/%s/managers/%s/' % (globals['name'], output_format, globals['manager']['machine'], globals['name'])
   if not os.path.exists(dir):
     os.makedirs(dir)
   f = open('%s/planet.xml' % (dir), 'w')
@@ -389,7 +389,7 @@ if output_format == 'flumotion':
   f.write('\n')
   f.close()
 
-  passwd = open('output/%s/%s/%s.passwd' % (output_format, globals['manager']['machine'], globals['name']), 'w')
+  passwd = open('%s/%s/%s/%s.passwd' % (globals['name'], output_format, globals['manager']['machine'], globals['name']), 'w')
 
   port = 9000
   for w in worker:
@@ -405,7 +405,7 @@ if output_format == 'flumotion':
       ports = "%i-%i" % (port, port+1)
       port+=2
       workerconf = template.render(globals=globals, name=w, password=password, portrange=ports)
-      dir = 'output/%s/%s/workers' % (output_format, machine)
+      dir = '%s/%s/%s/workers' % (globals['name'], output_format, machine)
       if not os.path.exists(dir):
         os.makedirs(dir)
       f = open('%s/%s-%s.xml' % (dir, globals['name'], w), 'w')