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 EA8D81382C5 for ; Tue, 19 May 2020 23:45:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA0E1E0835; Tue, 19 May 2020 23:45:36 +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 8AD88E0835 for ; Tue, 19 May 2020 23:45:36 +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 232E134F060 for ; Tue, 19 May 2020 23:45:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DA86AF for ; Tue, 19 May 2020 23:45:33 +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: <1589931926.2751ef36ebb4d2d81a847e43578292794e16da19.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: 2751ef36ebb4d2d81a847e43578292794e16da19 X-VCS-Branch: wip/mattst88 Date: Tue, 19 May 2020 23:45:33 +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: 750dd484-c37c-480a-b7b9-77de1a1fa2d4 X-Archives-Hash: c06c105b6e304a9bf4cefe01607bc6ff commit: 2751ef36ebb4d2d81a847e43578292794e16da19 Author: Matt Turner gentoo org> AuthorDate: Tue May 19 00:13:14 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue May 19 23:45:26 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2751ef36 catalyst: Verify config options against valid_config_file_values Signed-off-by: Matt Turner gentoo.org> catalyst/main.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index 159fe454..543895c6 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 @@ -34,7 +35,12 @@ def parse_config(config_files): for config_file in config_files: log.notice('Loading configuration file: %s', config_file) try: - conf_values.update(toml.load(config_file)) + config = toml.load(config_file) + for key in config: + if key not in valid_config_file_values: + log.critical("Unknown option '%s' in config file %s", + key, config_file) + conf_values.update(config) except Exception as e: log.critical('Could not find parse configuration file: %s: %s', config_file, e)