diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2016-03-23 14:14:33 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2016-03-23 14:14:33 -0700 |
| commit | 70457ffd8cd98593510d4baeb3010aad2f209065 (patch) | |
| tree | 0ac66d0283cbffdd10a99e85a05d9facfe1e3dce | |
| parent | catalyst: Apply patches from Yuta for additional needed bsd changes bug 574422 (diff) | |
| download | catalyst-70457ffd8cd98593510d4baeb3010aad2f209065.tar.gz catalyst-70457ffd8cd98593510d4baeb3010aad2f209065.tar.bz2 catalyst-70457ffd8cd98593510d4baeb3010aad2f209065.zip | |
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
| -rw-r--r-- | catalyst/base/stagebase.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 5e87f44f..b7fefb53 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 ' |