commit: 558064f6752e8446414f2e9aaad83b15660cb84a
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 14:35:57 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 14:35:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=558064f6
stagebase.py: Change a second unpack_info to use the
decompressor.create_infodict()
I missed one of the unpack_info definitions in the previous commit.
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 b7fefb5..b6dd08d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -800,13 +800,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
unpack_errmsg="Error unpacking snapshot using mode %(mode)s"
- unpack_info = {
- 'source': self.settings["snapshot_path"],
- 'destination': self.settings["snapshot_cache_path"],
- 'mode': None,
- 'auto-ext': False,
- 'other_options': self.settings["compressor_options"],
- }
+ unpack_info = self.decompressor.create_infodict(
+ source=self.settings["snapshot_path"],
+ destination=self.settings["snapshot_cache_path"],
+ arch=self.settings["compressor_arch"],
+ other_options=self.settings["compressor_options"],
+ )
target_portdir = normpath(self.settings["chroot_path"] +
self.settings["repo_basedir"] + "/" +
self.settings["repo_name"])
