1 |
commit: 59a3b592d0ede9f0bb6e323f58443acb6ef3b297 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 18 23:49:54 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 20 01:49:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=59a3b592 |
7 |
|
8 |
catalyst: Add a missing options to valid_config_file_values |
9 |
|
10 |
And remove required_config_file_values since we want to support running |
11 |
catalyst without a config file. |
12 |
|
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
catalyst/defaults.py | 20 +++++++++++--------- |
16 |
1 file changed, 11 insertions(+), 9 deletions(-) |
17 |
|
18 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
19 |
index 2f2c907f..412cb956 100644 |
20 |
--- a/catalyst/defaults.py |
21 |
+++ b/catalyst/defaults.py |
22 |
@@ -8,18 +8,20 @@ from DeComp.definitions import COMPRESSOR_PROGRAM_OPTIONS, XATTRS_OPTIONS |
23 |
from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS |
24 |
|
25 |
|
26 |
-required_config_file_values = [ |
27 |
- "distdir", |
28 |
- "portdir", |
29 |
- "sharedir", |
30 |
- "storedir", |
31 |
-] |
32 |
- |
33 |
-valid_config_file_values = required_config_file_values[:] |
34 |
-valid_config_file_values.extend([ |
35 |
+valid_config_file_values = frozenset([ |
36 |
"digests", |
37 |
+ "distdir", |
38 |
"envscript", |
39 |
"options", |
40 |
+ "port_logdir", |
41 |
+ "repo_basedir", |
42 |
+ "repo_name", |
43 |
+ "repos", |
44 |
+ "sharedir", |
45 |
+ "storedir", |
46 |
+ "target_distdir", |
47 |
+ "target_pkgdir", |
48 |
+ "var_tmpfs_portage", |
49 |
]) |
50 |
|
51 |
confdefaults = { |