From 0f9be8fdee298b2beb6ccad96521410e84de95e2 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 13 Oct 2012 14:12:24 +0200
Subject: fixed deployment improved xml file naming (not clashing with other
 names)

---
 src/flufigut-client.sh | 2 +-
 src/flufigut.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/flufigut-client.sh b/src/flufigut-client.sh
index b245d33..1fd6de1 100755
--- a/src/flufigut-client.sh
+++ b/src/flufigut-client.sh
@@ -84,7 +84,7 @@ case "$command" in
   install)
     echo -n "install files from $param ... "
     cd $CONF_DIR
-    sudo -u flumotion tar --strip-components=1 -xzf "$param"
+    sudo -u flumotion tar --strip-components=2 -xzf "$param"
     rm "$param"
     echo "done."
   ;;
diff --git a/src/flufigut.py b/src/flufigut.py
index 5d14dd8..ae4edb4 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -356,7 +356,7 @@ for w in worker:
     dir = 'output/%s/workers' % machine
     if not os.path.exists(dir):
       os.makedirs(dir)
-    f = open('%s/%s.xml' % (dir, w), 'w')
+    f = open('%s/%s-%s.xml' % (dir, globals['name'], w), 'w')
     f.write(workerconf.encode("utf8"))
     f.write('\n')
     f.close()
-- 
cgit v1.2.3