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 CEBAB1382C5 for ; Tue, 19 May 2020 23:04:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC6ABE083E; Tue, 19 May 2020 23:04:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B61ABE083E for ; Tue, 19 May 2020 23:04:39 +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 6AA7834F1C2 for ; Tue, 19 May 2020 23:04:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4BC81F5 for ; Tue, 19 May 2020 23:04:36 +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: <1589929459.9e6b6f653090e0708db55f89a965cfa38b16ce5e.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/main.py X-VCS-Directories: catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9e6b6f653090e0708db55f89a965cfa38b16ce5e X-VCS-Branch: wip/mattst88 Date: Tue, 19 May 2020 23:04:36 +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: ee378b76-f99f-48e5-9b31-914b23e7b09d X-Archives-Hash: 90c8c74c87c6efcedc2cd4175c1716fb commit: 9e6b6f653090e0708db55f89a965cfa38b16ce5e Author: Matt Turner gentoo org> AuthorDate: Tue May 19 00:13:14 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue May 19 23:04:19 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9e6b6f65 catalyst: Verify config options against valid_config_file_values Signed-off-by: Matt Turner gentoo.org> catalyst/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index 4a55ebe2..853e77d8 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -15,7 +15,8 @@ from DeComp.contents import ContentsMap from catalyst import log import catalyst.config -from catalyst.defaults import confdefaults, option_messages, DEFAULT_CONFIG_FILE +from catalyst.defaults import (confdefaults, option_messages, + DEFAULT_CONFIG_FILE, valid_config_file_values) from catalyst.support import CatalystError from catalyst.version import get_version @@ -47,8 +48,7 @@ def parse_config(config_files): if opt in option_messages: log.info(option_messages[opt]) - for key in ["digests", "envscript", "var_tmpfs_portage", "port_logdir", - "local_overlay", "repos"]: + for key in valid_config_file_values: if key in config: conf_values[key] = config[key]