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 A37E159CA5 for ; Wed, 23 Mar 2016 16:38:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C78521C002; Wed, 23 Mar 2016 16:38:52 +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 D7C7F21C002 for ; Wed, 23 Mar 2016 16:38:51 +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 A9182340C42 for ; Wed, 23 Mar 2016 16:38:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEE82851 for ; Wed, 23 Mar 2016 16:38:41 +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: <1458751005.0579e46fa1937c89cbc69a21a9596dadda5672eb.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 0579e46fa1937c89cbc69a21a9596dadda5672eb X-VCS-Branch: master Date: Wed, 23 Mar 2016 16:38:41 +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: 7e6870c3-0e5a-47fb-b72d-10b1d0ca8f74 X-Archives-Hash: bf62cf55e1830aaea0cdfebcc8db787b commit: 0579e46fa1937c89cbc69a21a9596dadda5672eb Author: Brian Dolbec gentoo org> AuthorDate: Wed Mar 23 16:30:51 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Mar 23 16:36:45 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0579e46f Fix commit 444e50e710f1 where I inaddvertently deleted the wrong paramter during the commit Also change the default (de)compression mode and search order to the non _x variant. catalyst/base/stagebase.py | 2 +- catalyst/defaults.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 9d3841c..fe5e6d2 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1271,7 +1271,7 @@ class StageBase(TargetBase, ClearBase, GenBase): if not self.compressor: self.compressor = CompressMap(self.settings["compress_definitions"], env=self.env, default_mode=self.settings['compression_mode'], - logger=log) + comp_prog=self.settings['comp_prog']) if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("capture"): diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 8b413f7..5ed19d1 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -33,10 +33,10 @@ valid_config_file_values.extend([ "distcc", "envscript", confdefaults={ "archdir": "%(PythonDir)s/arch", "comp_prog": COMPRESSOR_PROGRAM_OPTIONS[TAR], - "compression_mode": 'lbzip2_x', + "compression_mode": 'lbzip2', "compressor_arch": None, "compressor_options": XATTRS_OPTIONS[TAR], - "decompressor_search_order": DECOMPRESSOR_XATTR_SEARCH_ORDER, + "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, "distdir": "/usr/portage/distfiles", "hash_function": "crc32", "icecream": "/var/cache/icecream",