Add support for command-line substitutions (#1014)

* Add support for command-line substitutions

* Fix flake8

* pylint fixes
This commit is contained in:
Alex Mekkering
2020-06-21 20:33:01 +02:00
committed by GitHub
parent f9a8629157
commit ecb1c77f8b
4 changed files with 19 additions and 13 deletions
+6 -2
View File
@@ -101,11 +101,15 @@ def _substitute_item(substitutions, item, path):
return None
def do_substitution_pass(config):
if CONF_SUBSTITUTIONS not in config:
def do_substitution_pass(config, command_line_substitutions):
if CONF_SUBSTITUTIONS not in config and not command_line_substitutions:
return
substitutions = config[CONF_SUBSTITUTIONS]
if substitutions is None:
substitutions = command_line_substitutions
elif command_line_substitutions:
substitutions = {**substitutions, **command_line_substitutions}
with cv.prepend_path('substitutions'):
if not isinstance(substitutions, dict):
raise cv.Invalid("Substitutions must be a key to value mapping, got {}"