From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 22B551382C5 for ; Wed, 20 May 2020 00:26:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D42D6E0855; Wed, 20 May 2020 00:26:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BBC99E0855 for ; Wed, 20 May 2020 00:26:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D10D934F086 for ; Wed, 20 May 2020 00:26:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4A70258 for ; Wed, 20 May 2020 00:26:03 +0000 (UTC) From: "Matt Turner" 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" Message-ID: <1589934294.09c9a23de7abc124442e7954db08f198dca62d34.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 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: 09c9a23de7abc124442e7954db08f198dca62d34 X-VCS-Branch: wip/mattst88 Date: Wed, 20 May 2020 00:26:03 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eb67f727-e04b-4b8e-b655-cd3831a6b8db X-Archives-Hash: 65b36b4c3cdcd32af29d64eca9291e47 commit: 09c9a23de7abc124442e7954db08f198dca62d34 Author: Matt Turner gentoo org> AuthorDate: Mon May 18 23:49:54 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed May 20 00:24:54 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=09c9a23d catalyst: Add a missing options to valid_config_file_values And remove required_config_file_values since we want to support running catalyst without a config file. Signed-off-by: Matt Turner gentoo.org> catalyst/defaults.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 2f2c907f..412cb956 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -8,18 +8,20 @@ from DeComp.definitions import COMPRESSOR_PROGRAM_OPTIONS, XATTRS_OPTIONS from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS -required_config_file_values = [ - "distdir", - "portdir", - "sharedir", - "storedir", -] - -valid_config_file_values = required_config_file_values[:] -valid_config_file_values.extend([ +valid_config_file_values = frozenset([ "digests", + "distdir", "envscript", "options", + "port_logdir", + "repo_basedir", + "repo_name", + "repos", + "sharedir", + "storedir", + "target_distdir", + "target_pkgdir", + "var_tmpfs_portage", ]) confdefaults = {