From: Daniel Cordero <[email protected]>
The catalyst.git script specified this configuration option, which would
not pass validation because shdir was not in the list of
valid_config_file_values.
Add shdir to the list of allowed valid_config_file_values.
Remove shdir from the catalyst.git script anyway, as it would match the default.
Fixes: 8443f89f3c5df (catalyst: Verify config options against
valid_config_file_values)
NOTICE : Loading configuration file: /tmp/catalyst.conf.tyxsgh1l
CRITICAL: Unknown option 'shdir' in config file /tmp/catalyst.conf.tyxsgh1l
---
bin/catalyst.git | 1 -
catalyst/defaults.py | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/catalyst.git b/bin/catalyst.git
index 071bf58b..29b72c30 100755
--- a/bin/catalyst.git
+++ b/bin/catalyst.git
@@ -28,7 +28,6 @@ def main(argv):
# Set up a config file with paths to the local tree.
conf.write(
('sharedir="%(source_root)s"\n'
- 'shdir="%(source_root)s/targets"\n'
'envscript="%(source_root)s/etc/catalystrc"\n'
% {'source_root': source_root}).encode('utf8')
)
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 14f671fe..b5026e95 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -18,6 +18,7 @@ valid_config_file_values = frozenset([
"repo_name",
"repos",
"sharedir",
+ "shdir",
"storedir",
"target_distdir",
"target_pkgdir",
--
2.26.2
