| 1 |
commit: 12f082c64a1720ac1e82e91ed6e3a0a452afa4aa |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 27 20:23:12 2013 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 27 20:23:12 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=12f082c6 |
| 7 |
|
| 8 |
Revert "use lbzip2 to unpack the stages" |
| 9 |
|
| 10 |
This reverts commit 978c02e6fa04ab7ed1a40003fa0eb4cfce952ca2, missed a |
| 11 |
test |
| 12 |
|
| 13 |
--- |
| 14 |
modules/generic_stage_target.py | 8 ++++---- |
| 15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 18 |
index a9cc68e..31cb025 100644 |
| 19 |
--- a/modules/generic_stage_target.py |
| 20 |
+++ b/modules/generic_stage_target.py |
| 21 |
@@ -657,7 +657,7 @@ class generic_stage_target(generic_target): |
| 22 |
unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 23 |
self.settings["chroot_path"] |
| 24 |
else: |
| 25 |
- unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 26 |
+ unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ |
| 27 |
self.settings["chroot_path"] |
| 28 |
error_msg="Tarball extraction of "+\ |
| 29 |
self.settings["source_path"]+" to "+\ |
| 30 |
@@ -672,7 +672,7 @@ class generic_stage_target(generic_target): |
| 31 |
unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 32 |
self.settings["chroot_path"] |
| 33 |
else: |
| 34 |
- unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 35 |
+ unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ |
| 36 |
self.settings["chroot_path"] |
| 37 |
error_msg="Tarball extraction of "+self.settings["source_path"]+\ |
| 38 |
" to "+self.settings["chroot_path"]+" failed." |
| 39 |
@@ -773,7 +773,7 @@ class generic_stage_target(generic_target): |
| 40 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 41 |
unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 42 |
else: |
| 43 |
- unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 44 |
+ unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 45 |
unpack_errmsg="Error unpacking snapshot" |
| 46 |
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ |
| 47 |
self.settings["snapshot_cache_path"]+\ |
| 48 |
@@ -793,7 +793,7 @@ class generic_stage_target(generic_target): |
| 49 |
unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 50 |
self.settings["chroot_path"]+"/usr" |
| 51 |
else: |
| 52 |
- unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 53 |
+ unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 54 |
self.settings["chroot_path"]+"/usr" |
| 55 |
unpack_errmsg="Error unpacking snapshot" |
Archives