[PATCH master 1/8] Initial commit for ovfconverter tool

[Agata Murawska]

Signed-off-by: Agata Murawska <agatamuraw...@google.com>
---
 lib/ovf.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/ovf.py b/lib/ovf.py
index 6415383..21816e8 100644
--- a/lib/ovf.py
+++ b/lib/ovf.py
@@ -38,8 +38,12 @@ class Converter(object):
 
   @type options: optparse.Values
   @ivar options: options parsed from the command line
-  @type temp_compress: list
-  @ivar temp_compress: list of disk files that were (de)compressed
+  @type output_dir: string
+  @ivar output_dir: directory to which the results of conversion shall be
+    written
+  @type temp_file_manager: L{utils.TemporaryFileManager}
+  @ivar temp_file_manager: container for temporary files created during
+    conversion
   @type temp_dir: string
   @ivar temp_dir: temporary directory created then we deal with OVA
 
@@ -59,8 +63,9 @@ class Converter(object):
     if not os.path.isfile(input_path):
       raise errors.OpPrereqError("File does not exist: %s" % input_path)
     self.options = options
-    self.temp_compress = []
+    self.temp_file_manager = utils.TemporaryFileManager()
     self.temp_dir = None
+    self.output_dir = None
     self._ReadInputData(input_path)
 
   def _ReadInputData(self, input_path):
@@ -88,12 +93,10 @@ class Converter(object):
     """Cleans the temporary directory, if one was created.
 
     """
+    self.temp_file_manager.Cleanup()
     if self.temp_dir:
       shutil.rmtree(self.temp_dir)
       self.temp_dir = None
-    for file_name in self.temp_compress:
-      utils.RemoveFile(file_name)
-    self.temp_compress = []
 
 
 class OVFImporter(Converter):
-- 
1.7.3.1