[oe-commits] [bitbake] 03/03: fetch2: fix unpacking of deb packages

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 17ff08d225a8fa7faffd683c028369574954fba9
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Wed May 25 16:46:44 2016 +1200

    fetch2: fix unpacking of deb packages
    
    deb packages in modern Debian versions have the data tarball compressed
    with xz rather than gzip, and thus explicitly extracting data.tar.gz
    fails. Unfortunately ar doesn't support wildcards matching items to
    extract, so we have to find out what the name of the file is first and
    then extract it, relying on tar to figure out how to unpack it based on
    the filename rather than doing it with pipes and making that
    determination ourselves.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index be01bdb..f612318 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1392,7 +1392,18 @@ class FetchMethod(object):
                 else:
                     cmd = 'rpm2cpio.sh %s | cpio -id' % (file)
             elif file.endswith('.deb') or file.endswith('.ipk'):
-                cmd = 'ar -p %s data.tar.gz | zcat | tar --no-same-owner -xpf -' % file
+                output = subprocess.check_output('ar -t %s' % file, preexec_fn=subprocess_setup, shell=True)
+                datafile = None
+                if output:
+                    for line in output.splitlines():
+                        if line.startswith('data.tar.'):
+                            datafile = line
+                            break
+                    else:
+                        raise UnpackError("Unable to unpack deb/ipk package - does not contain data.tar.* file", urldata.url)
+                else:
+                    raise UnpackError("Unable to unpack deb/ipk package - could not list contents", urldata.url)
+                cmd = 'ar x %s %s && tar --no-same-owner -xpf %s && rm %s' % (file, datafile, datafile, datafile)
             elif file.endswith('.tar.7z'):
                 cmd = '7z x -so %s | tar xf - ' % file
             elif file.endswith('.7z'):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.