From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3B08859CA5 for ; Wed, 23 Mar 2016 21:15:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DF8321C003; Wed, 23 Mar 2016 21:15:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA1E421C003 for ; Wed, 23 Mar 2016 21:15:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74443340C96 for ; Wed, 23 Mar 2016 21:15:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 584FA1F2 for ; Wed, 23 Mar 2016 21:15:46 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1458767673.70457ffd8cd98593510d4baeb3010aad2f209065.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 70457ffd8cd98593510d4baeb3010aad2f209065 X-VCS-Branch: master Date: Wed, 23 Mar 2016 21:15:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 833cc071-bc4b-4c30-8553-d335f34b2034 X-Archives-Hash: 851de17b95824ab82ebe5500c34ca705 commit: 70457ffd8cd98593510d4baeb3010aad2f209065 Author: Brian Dolbec gentoo org> AuthorDate: Wed Mar 23 21:14:33 2016 +0000 Commit: Brian Dolbec gentoo 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 '