From 12f082c64a1720ac1e82e91ed6e3a0a452afa4aa Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 27 May 2013 16:23:12 -0400 Subject: [PATCH] Revert "use lbzip2 to unpack the stages" This reverts commit 978c02e6fa04ab7ed1a40003fa0eb4cfce952ca2, missed a test --- modules/generic_stage_target.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index a9cc68ec..31cb025e 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -657,7 +657,7 @@ class generic_stage_target(generic_target): unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] else: - unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+\ self.settings["source_path"]+" to "+\ @@ -672,7 +672,7 @@ class generic_stage_target(generic_target): unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] else: - unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+self.settings["source_path"]+\ " to "+self.settings["chroot_path"]+" failed." @@ -773,7 +773,7 @@ class generic_stage_target(generic_target): if "bz2" == self.settings["chroot_path"][-3:]: unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir else: - unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir + unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+destdir unpack_errmsg="Error unpacking snapshot" cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ self.settings["snapshot_cache_path"]+\ @@ -793,7 +793,7 @@ class generic_stage_target(generic_target): unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ self.settings["chroot_path"]+"/usr" else: - unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ + unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+\ self.settings["chroot_path"]+"/usr" unpack_errmsg="Error unpacking snapshot" -- 2.26.2