commit: 70457ffd8cd98593510d4baeb3010aad2f209065
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 21:14:33 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 21:14:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=70457ffd
stagebase.py: Change unpack_info to use the decompressor.create_infodict()
This eliminates the need to manually add in CompressMap global variables which
are
automatically added to the info_dict.
Fixes commit: 966bff4dae7ed88aa807282ae299c3c0da1f966d
catalyst/base/stagebase.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 5e87f44..b7fefb5 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -685,13 +685,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
clst_unpack_hash = self.resume.get("unpack")
- unpack_info = {
- 'source': self.settings["source_path"],
- "destination": self.settings["chroot_path"],
- 'mode': None,
- 'auto-ext': False,
- 'other_options': self.settings["compressor_options"],
- }
+ unpack_info = self.decompressor.create_infodict(
+ source=self.settings["source_path"],
+ destination=self.settings["chroot_path"],
+ arch=self.settings["compressor_arch"],
+ other_options=self.settings["compressor_options"],
+ )
display_msg = (
'Starting %(mode)s from %(source)s\nto '
