Merge lp:~milo/linaro-image-tools/bug1081747 into lp:linaro-image-tools/11.11

[Milo Casagrande]

Refactored out the PackageUnpacker class in order to avoid unrelated imports
so that linaro-android-media-create can be run (from source) also under non
Debian-based system.

[James Tunnicliffe (dooferlad)]

Looks good to me.

review: Approve

=== modified file 'linaro_image_tools/hwpack/builder.py'
--- linaro_image_tools/hwpack/builder.py	2013-02-18 13:05:58 +0000
+++ linaro_image_tools/hwpack/builder.py	2013-06-04 13:05:38 +0000
@@ -22,7 +22,6 @@
 import logging
 import errno
 import subprocess
-import tempfile
 import os
 import shutil
 from glob import iglob
@@ -39,6 +38,7 @@
     LocalArchiveMaker,
     PackageFetcher,
 )
+from linaro_image_tools.hwpack.package_unpacker import PackageUnpacker
 
 from linaro_image_tools.hwpack.hwpack_fields import (
     PACKAGE_FIELD,
@@ -59,44 +59,6 @@
             "No such config file: '%s'" % self.filename)
 
 
-class PackageUnpacker(object):
-    def __enter__(self):
-        self.tempdir = tempfile.mkdtemp()
-        return self
-
-    def __exit__(self, type, value, traceback):
-        if self.tempdir is not None and os.path.exists(self.tempdir):
-            shutil.rmtree(self.tempdir)
-
-    def get_path(self, package_file_name, file_name=''):
-        """Get package or file path in unpacker tmp dir."""
-        package_dir = os.path.basename(package_file_name)
-        return os.path.join(self.tempdir, package_dir, file_name)
-
-    def unpack_package(self, package_file_name):
-        # We could extract only a single file, but since dpkg will pipe
-        # the entire package through tar anyway we might as well extract all.
-        unpack_dir = self.get_path(package_file_name)
-        if not os.path.isdir(unpack_dir):
-            os.mkdir(unpack_dir)
-        p = cmd_runner.run(["tar", "-C", unpack_dir, "-xf", "-"],
-                           stdin=subprocess.PIPE)
-        cmd_runner.run(["dpkg", "--fsys-tarfile", package_file_name],
-                       stdout=p.stdin).communicate()
-        p.communicate()
-
-    def get_file(self, package, file):
-        # File path passed here must not be absolute, or file from
-        # real filesystem will be referenced.
-        assert file and file[0] != '/'
-        self.unpack_package(package)
-        logger.debug("Unpacked package %s." % package)
-        temp_file = self.get_path(package, file)
-        assert os.path.exists(temp_file), "The file '%s' was " \
-            "not found in the package '%s'." % (file, package)
-        return temp_file
-
-
 class HardwarePackBuilder(object):
 
     def __init__(self, config_path, version, local_debs, out_name=None):

=== modified file 'linaro_image_tools/hwpack/handler.py'
--- linaro_image_tools/hwpack/handler.py	2013-02-18 13:05:58 +0000
+++ linaro_image_tools/hwpack/handler.py	2013-06-04 13:05:38 +0000
@@ -27,7 +27,7 @@
 import tempfile
 
 from linaro_image_tools.hwpack.config import Config
-from linaro_image_tools.hwpack.builder import PackageUnpacker
+from linaro_image_tools.hwpack.package_unpacker import PackageUnpacker
 from linaro_image_tools.utils import DEFAULT_LOGGER_NAME
 
 

=== added file 'linaro_image_tools/hwpack/package_unpacker.py'
--- linaro_image_tools/hwpack/package_unpacker.py	1970-01-01 00:00:00 +0000
+++ linaro_image_tools/hwpack/package_unpacker.py	2013-06-04 13:05:38 +0000
@@ -0,0 +1,66 @@
+# Copyright (C) 2010, 2011, 2013 Linaro
+#
+# This file is part of Linaro Image Tools.
+#
+# Linaro Image Tools is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# Linaro Image Tools is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Linaro Image Tools; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+
+import logging
+import os
+import tempfile
+
+from subprocess import PIPE
+from shutil import rmtree
+
+from linaro_image_tools import cmd_runner
+
+logger = logging.getLogger(__name__)
+
+
+class PackageUnpacker(object):
+    def __enter__(self):
+        self.tempdir = tempfile.mkdtemp()
+        return self
+
+    def __exit__(self, type, value, traceback):
+        if self.tempdir is not None and os.path.exists(self.tempdir):
+            rmtree(self.tempdir)
+
+    def get_path(self, package_file_name, file_name=''):
+        """Get package or file path in unpacker tmp dir."""
+        package_dir = os.path.basename(package_file_name)
+        return os.path.join(self.tempdir, package_dir, file_name)
+
+    def unpack_package(self, package_file_name):
+        # We could extract only a single file, but since dpkg will pipe
+        # the entire package through tar anyway we might as well extract all.
+        unpack_dir = self.get_path(package_file_name)
+        if not os.path.isdir(unpack_dir):
+            os.mkdir(unpack_dir)
+        p = cmd_runner.run(["tar", "-C", unpack_dir, "-xf", "-"], stdin=PIPE)
+        cmd_runner.run(["dpkg", "--fsys-tarfile", package_file_name],
+                       stdout=p.stdin).communicate()
+        p.communicate()
+
+    def get_file(self, package, file):
+        # File path passed here must not be absolute, or file from
+        # real filesystem will be referenced.
+        assert file and file[0] != '/'
+        self.unpack_package(package)
+        logger.debug("Unpacked package %s." % package)
+        temp_file = self.get_path(package, file)
+        assert os.path.exists(temp_file), "The file '%s' was " \
+            "not found in the package '%s'." % (file, package)
+        return temp_file

=== modified file 'linaro_image_tools/hwpack/tests/test_builder.py'
--- linaro_image_tools/hwpack/tests/test_builder.py	2013-02-17 13:53:41 +0000
+++ linaro_image_tools/hwpack/tests/test_builder.py	2013-06-04 13:05:38 +0000
@@ -27,10 +27,10 @@
 
 from linaro_image_tools.hwpack.builder import (
     ConfigFileMissing,
-    PackageUnpacker,
     HardwarePackBuilder,
     logger as builder_logger,
 )
+from linaro_image_tools.hwpack.package_unpacker import PackageUnpacker
 from linaro_image_tools.hwpack.config import HwpackConfigError
 from linaro_image_tools.hwpack.hardwarepack import Metadata
 from linaro_image_tools.hwpack.packages import (