aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2013-05-27 16:23:12 -0400
committerRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2013-05-27 16:23:12 -0400
commit12f082c64a1720ac1e82e91ed6e3a0a452afa4aa (patch)
treeb5c0dd52d55a912db5ef437aa4f81eb6d162da50
parentuse lbzip2 to unpack the stages (diff)
downloadcatalyst-12f082c64a1720ac1e82e91ed6e3a0a452afa4aa.tar.gz
catalyst-12f082c64a1720ac1e82e91ed6e3a0a452afa4aa.tar.bz2
catalyst-12f082c64a1720ac1e82e91ed6e3a0a452afa4aa.zip
Revert "use lbzip2 to unpack the stages"
This reverts commit 978c02e6fa04ab7ed1a40003fa0eb4cfce952ca2, missed a test
-rw-r--r--modules/generic_stage_target.py8
1 files 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"