| 1 |
From: Daniel Cordero <catalyst@××××.io> |
| 2 |
|
| 3 |
The catalyst.git script specified this configuration option, which would |
| 4 |
not pass validation because shdir was not in the list of |
| 5 |
valid_config_file_values. |
| 6 |
|
| 7 |
Add shdir to the list of allowed valid_config_file_values. |
| 8 |
|
| 9 |
Remove shdir from the catalyst.git script anyway, as it would match the default. |
| 10 |
|
| 11 |
Fixes: 8443f89f3c5df (catalyst: Verify config options against valid_config_file_values) |
| 12 |
|
| 13 |
NOTICE : Loading configuration file: /tmp/catalyst.conf.tyxsgh1l |
| 14 |
CRITICAL: Unknown option 'shdir' in config file /tmp/catalyst.conf.tyxsgh1l |
| 15 |
--- |
| 16 |
bin/catalyst.git | 1 - |
| 17 |
catalyst/defaults.py | 1 + |
| 18 |
2 files changed, 1 insertion(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/bin/catalyst.git b/bin/catalyst.git |
| 21 |
index 071bf58b..29b72c30 100755 |
| 22 |
--- a/bin/catalyst.git |
| 23 |
+++ b/bin/catalyst.git |
| 24 |
@@ -28,7 +28,6 @@ def main(argv): |
| 25 |
# Set up a config file with paths to the local tree. |
| 26 |
conf.write( |
| 27 |
('sharedir="%(source_root)s"\n' |
| 28 |
- 'shdir="%(source_root)s/targets"\n' |
| 29 |
'envscript="%(source_root)s/etc/catalystrc"\n' |
| 30 |
% {'source_root': source_root}).encode('utf8') |
| 31 |
) |
| 32 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 33 |
index 14f671fe..b5026e95 100644 |
| 34 |
--- a/catalyst/defaults.py |
| 35 |
+++ b/catalyst/defaults.py |
| 36 |
@@ -18,6 +18,7 @@ valid_config_file_values = frozenset([ |
| 37 |
"repo_name", |
| 38 |
"repos", |
| 39 |
"sharedir", |
| 40 |
+ "shdir", |
| 41 |
"storedir", |
| 42 |
"target_distdir", |
| 43 |
"target_pkgdir", |
| 44 |
-- |
| 45 |
2.26.2 |
Archives