summaryrefslogtreecommitdiffstats
path: root/recipes-test/virt-test/files/fix_asset_uncompress.patch
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2014-10-10 03:19:54 +0200
committerTudor Florea <tudor.florea@enea.com>2014-10-10 03:19:54 +0200
commitc158582c0fc7f4bd73980fe9adad446855f4d61b (patch)
tree31b701a2367cb983e76e76cd7c2ba176ad33e5ac /recipes-test/virt-test/files/fix_asset_uncompress.patch
downloadmeta-vt-daisy-140929.tar.gz
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'recipes-test/virt-test/files/fix_asset_uncompress.patch')
-rw-r--r--recipes-test/virt-test/files/fix_asset_uncompress.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-test/virt-test/files/fix_asset_uncompress.patch b/recipes-test/virt-test/files/fix_asset_uncompress.patch
new file mode 100644
index 0000000..9b2b05c
--- /dev/null
+++ b/recipes-test/virt-test/files/fix_asset_uncompress.patch
@@ -0,0 +1,29 @@
1virt-test: Fixed asset uncompression
2
3Fix a mismatch in the uncompress command to allow it to work also with
4the other compression types.
5
6Upstream-Status: Accepted
7https://github.com/autotest/virt-test/commit/a4f4b89b0bf3adffb0188f4091b5c66d41f7eba7
8
9Signed-off-by: Petre Pircalabu <petre.pircalabu@enea.com>
10
11--- a/virttest/asset.py
12+++ b/virttest/asset.py
13@@ -91,13 +91,13 @@ def uncompress_asset(asset_info, force=F
14 if match:
15 if match.group(1) == 'gz':
16 uncompress_cmd = ('gzip -cd %s > %s' %
17- (destination_uncompressed, destination))
18+ (destination, destination_uncompressed))
19 elif match.group(1) == 'xz':
20 uncompress_cmd = ('xz -cd %s > %s' %
21- (destination_uncompressed, destination))
22+ (destination, destination_uncompressed))
23 elif match.group(1) == 'bz2':
24 uncompress_cmd = ('bzip2 -cd %s > %s' %
25- (destination_uncompressed, destination))
26+ (destination, destination_uncompressed))
27 elif match.group(1) == '7z':
28 uncompress_cmd = '7za -y e %s' % destination
29 else: