Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 11/21] catalyst: Add a missing options to valid_config_file_values
Date: Wed, 20 May 2020 03:43:03
Message-Id: 20200520034226.2870937-11-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/21] targets: Remove copy_{file,symlink,lib} functions by Matt Turner
1 And remove required_config_file_values since we want to support running
2 catalyst without a config file.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 catalyst/defaults.py | 20 +++++++++++---------
7 1 file changed, 11 insertions(+), 9 deletions(-)
8
9 diff --git a/catalyst/defaults.py b/catalyst/defaults.py
10 index 2f2c907f..412cb956 100644
11 --- a/catalyst/defaults.py
12 +++ b/catalyst/defaults.py
13 @@ -8,18 +8,20 @@ from DeComp.definitions import COMPRESSOR_PROGRAM_OPTIONS, XATTRS_OPTIONS
14 from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS
15
16
17 -required_config_file_values = [
18 - "distdir",
19 - "portdir",
20 - "sharedir",
21 - "storedir",
22 -]
23 -
24 -valid_config_file_values = required_config_file_values[:]
25 -valid_config_file_values.extend([
26 +valid_config_file_values = frozenset([
27 "digests",
28 + "distdir",
29 "envscript",
30 "options",
31 + "port_logdir",
32 + "repo_basedir",
33 + "repo_name",
34 + "repos",
35 + "sharedir",
36 + "storedir",
37 + "target_distdir",
38 + "target_pkgdir",
39 + "var_tmpfs_portage",
40 ])
41
42 confdefaults = {
43 --
44 2.26.2