From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1162716-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B517C138353 for <garchives@archives.gentoo.org>; Fri, 17 Apr 2020 19:52:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08B08E089B; Fri, 17 Apr 2020 19:52:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF7F5E088B for <gentoo-commits@lists.gentoo.org>; Fri, 17 Apr 2020 19:52:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03F3A34F151 for <gentoo-commits@lists.gentoo.org>; Fri, 17 Apr 2020 19:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 480F41D8 for <gentoo-commits@lists.gentoo.org>; Fri, 17 Apr 2020 19:52:26 +0000 (UTC) From: "Matt Turner" <mattst88@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org> Message-ID: <1587094971.0239c60e9a811f46b080fa96074ce9cf82cc55e0.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/defaults.py X-VCS-Directories: catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0239c60e9a811f46b080fa96074ce9cf82cc55e0 X-VCS-Branch: master Date: Fri, 17 Apr 2020 19:52:26 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b9f6926-6285-44a8-98ff-da2c8b71b0be X-Archives-Hash: c95de4f49531e5c780ee7ff7a852b665 commit: 0239c60e9a811f46b080fa96074ce9cf82cc55e0 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Apr 17 03:41:24 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Apr 17 03:42:51 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0239c60e catalyst: Reformat some array definitions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/defaults.py | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 8e276500..570fc4df 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -5,22 +5,47 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS # these should never be touched -required_build_targets = ["targetbase", "generic_stage_target"] +required_build_targets = [ + "generic_stage_target", + "targetbase", +] # new build types should be added here -valid_build_targets = ["stage1_target", "stage2_target", "stage3_target", - "stage4_target", "livecd_stage1_target", "livecd_stage2_target", - "embedded_target", "snapshot_target", "netboot_target" - ] +valid_build_targets = [ + "embedded_target", + "livecd_stage1_target", + "livecd_stage2_target", + "netboot_target", + "snapshot_target", + "stage1_target", + "stage2_target", + "stage3_target", + "stage4_target", +] -required_config_file_values = ["storedir", "sharedir", "distdir", "portdir"] +required_config_file_values = [ + "distdir", + "portdir", + "sharedir", + "storedir", +] valid_config_file_values = required_config_file_values[:] -valid_config_file_values.extend(["distcc", "envscript", - "options", "DEBUG", "VERBOSE", - "snapshot_cache", "hash_function", "digests", "contents", "compressor_arch", - "compression_mode", "compressor_options", "decompressor_search_order", - ]) +valid_config_file_values.extend([ + "compression_mode", + "compressor_arch", + "compressor_options", + "contents", + "DEBUG", + "decompressor_search_order", + "digests", + "distcc", + "envscript", + "hash_function", + "options", + "snapshot_cache", + "VERBOSE", +]) # set our base defaults here to keep # them in one location.