commit: ed05b6e13d0eea2f6be2a631bea870978da150d0 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon May 18 23:49:54 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue May 19 22:54:21 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ed05b6e1
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 <mattst88 <AT> 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 = {