From 56e837b81026cf5784c4dadb2c8330239e72e413 Mon Sep 17 00:00:00 2001
From: Ekaterina Fedorova <efedorova@mirantis.com>
Date: Thu, 7 Nov 2013 19:19:56 +0400
Subject: [PATCH] Fix conductor

1) Support python 2.6
2) Add files to manifest

Change-Id: I5b3c439e31803e48d01643a010df3538d5068acb
---
 MANIFEST.in                 | 3 ++-
 etc/conductor.conf          | 4 ++--
 muranoconductor/metadata.py | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 540b720..4b86f71 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
-include requirements.txt
\ No newline at end of file
+include requirements.txt
+recursive-include etc *
diff --git a/etc/conductor.conf b/etc/conductor.conf
index bf1417f..bf6c3c1 100644
--- a/etc/conductor.conf
+++ b/etc/conductor.conf
@@ -8,10 +8,10 @@ debug=True
 verbose=True
 
 # Provide directory with initialization scripts
-init_scripts_dir = ./etc/init-scripts
+init_scripts_dir = /etc/init-scripts
 
 # Provide directory with agent configs
-agent_config_dir = ./etc/agent-config
+agent_config_dir = /etc/agent-config
 
 # Provide absolute or relative path to data storing
 # directory (may not be exist)
diff --git a/muranoconductor/metadata.py b/muranoconductor/metadata.py
index bd8ac12..68b9407 100644
--- a/muranoconductor/metadata.py
+++ b/muranoconductor/metadata.py
@@ -44,8 +44,11 @@ def _unpack_data_archive(task_id, hash):
     dst_dir = task_id
     if not os.path.exists(dst_dir):
         os.mkdir(dst_dir)
-    with tarfile.open(archive_name, 'r:gz') as tar:
+    tar = tarfile.open(archive_name, 'r:gz')
+    try:
         tar.extractall(path=dst_dir)
+    finally:
+        tar.close()
     return dst_dir