[oe-commits] Eric Bénard : lib/oe/unpack.py: fix uncompressing .gz .bz2 or .xz
git version control
git at git.openembedded.org
Mon Sep 6 21:13:04 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 27c47106edd05d478d09a5d190e7dade5ed21926
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=27c47106edd05d478d09a5d190e7dade5ed21926
Author: Eric Bénard <eric at eukrea.com>
Date: Mon Sep 6 19:23:56 2010 +0200
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 <eric at eukrea.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Chris Larson <chris_larson at mentor.com>
---
lib/oe/unpack.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/oe/unpack.py b/lib/oe/unpack.py
index 34569aa..6d24c5e 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:
More information about the Openembedded-commits
mailing list