aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-05-18 17:13:14 -0700
committerMatt Turner <mattst88@gentoo.org>2020-05-19 18:49:37 -0700
commit8443f89f3c5dfbc011a333e90bfef772a95e47cd (patch)
treea569a31fc80af6dc663616767e430aa9dbf684e9
parentcatalyst: Convert catalyst.conf to TOML (diff)
downloadcatalyst-8443f89f3c5dfbc011a333e90bfef772a95e47cd.tar.gz
catalyst-8443f89f3c5dfbc011a333e90bfef772a95e47cd.tar.bz2
catalyst-8443f89f3c5dfbc011a333e90bfef772a95e47cd.zip
catalyst: Verify config options against valid_config_file_values
Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--catalyst/main.py10
1 files 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)