From: Eric Bénard Date: Mon, 6 Sep 2010 17:23:56 +0000 (+0200) Subject: lib/oe/unpack.py: fix uncompressing .gz .bz2 or .xz X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27c47106edd05d478d09a5d190e7dade5ed21926;p=openembedded.git lib/oe/unpack.py: fix uncompressing .gz .bz2 or .xz * Actually, the uncompressed file is written into the source path instead of the destination path. * By also removing the source path, this patch should fix this problem. * An other fix could be to not uncompress to stdout but let gunzip|bunzip2| xz uncompress directly to the file. Signed-off-by: Eric Bénard Acked-by: Frans Meulenbroeks Acked-by: Chris Larson --- diff --git a/lib/oe/unpack.py b/lib/oe/unpack.py index 34569aa004..6d24c5e2fa 100644 --- a/lib/oe/unpack.py +++ b/lib/oe/unpack.py @@ -63,16 +63,16 @@ def unpack_file(file, destdir, dos=False, env=None): elif file.endswith('.tbz') or file.endswith('.tbz2') or file.endswith('.tar.bz2'): cmd = 'bzip2 -dc %s | tar x --no-same-owner -f -' % file elif file.endswith('.gz') or file.endswith('.Z') or file.endswith('.z'): - base, ext = os.path.splitext(file) - cmd = 'gzip -dc %s > %s' % (file, base) + root, ext = os.path.splitext(file) + cmd = 'gzip -dc %s > %s' % (file, os.path.basename(root)) elif file.endswith('.bz2'): - base, ext = os.path.splitext(file) - cmd = 'bzip2 -dc %s > %s' % (file, base) + root, ext = os.path.splitext(file) + cmd = 'bzip2 -dc %s > %s' % (file, os.path.basename(root)) elif file.endswith('.tar.xz'): cmd = 'xz -dc %s | tar x --no-same-owner -f -' % file elif file.endswith('.xz'): - base, ext = os.path.splitext(file) - cmd = 'xz -dc %s > %s' % (file, base) + root, ext = os.path.splitext(file) + cmd = 'xz -dc %s > %s' % (file, os.path.basename(root)) elif file.endswith('.zip') or file.endswith('.jar'): cmd = 'unzip -q -o' if dos: