sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-04-19 01:00:28 +01:00
Code Issues Releases Wiki Activity

Move replaceme check therefore allowing actual line to be shown

Browse Source
This commit is contained in:
Jesse Hills 2023-02-02 19:39:29 +13:00
parent e95d6041d8
commit 751853efdc
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
esphome/config.py
View File

@ -654,7 +654,7 @@ def validate_config(config, command_line_substitutions) -> Config:
loader.clear_component_meta_finders() loader.clear_component_meta_finders()
loader.install_custom_components_meta_finder() loader.install_custom_components_meta_finder()
# 0. Load packages # Load packages
if CONF_PACKAGES in config: if CONF_PACKAGES in config:
from esphome.components.packages import do_packages_pass from esphome.components.packages import do_packages_pass
@ -668,7 +668,7 @@ def validate_config(config, command_line_substitutions) -> Config:
CORE.raw_config = config CORE.raw_config = config
# 1. Load substitutions # Load substitutions
if CONF_SUBSTITUTIONS in config: if CONF_SUBSTITUTIONS in config:
from esphome.components import substitutions from esphome.components import substitutions
@ -686,13 +686,7 @@ def validate_config(config, command_line_substitutions) -> Config:
CORE.raw_config = config CORE.raw_config = config
# 1.1. Check for REPLACEME special value # Load external_components
try:
recursive_check_replaceme(config)
except vol.Invalid as err:
result.add_error(err)
# 1.2. Load external_components
if CONF_EXTERNAL_COMPONENTS in config: if CONF_EXTERNAL_COMPONENTS in config:
from esphome.components.external_components import do_external_components_pass from esphome.components.external_components import do_external_components_pass
@ -719,7 +713,7 @@ def validate_config(config, command_line_substitutions) -> Config:
) )
return result return result
# 2. Load partial core config # Load partial core config
result[CONF_ESPHOME] = config[CONF_ESPHOME] result[CONF_ESPHOME] = config[CONF_ESPHOME]
result.add_output_path([CONF_ESPHOME], CONF_ESPHOME) result.add_output_path([CONF_ESPHOME], CONF_ESPHOME)
try: try:
@ -740,6 +734,12 @@ def validate_config(config, command_line_substitutions) -> Config:
# do not try to validate further as we don't know what the target is # do not try to validate further as we don't know what the target is
return result return result
# Check for REPLACEME special value
try:
recursive_check_replaceme(config)
except vol.Invalid as err:
result.add_error(err)
for domain, conf in config.items(): for domain, conf in config.items():
result.add_validation_step(LoadValidationStep(domain, conf)) result.add_validation_step(LoadValidationStep(domain, conf))
result.add_validation_step(IDPassValidationStep()) result.add_validation_step(IDPassValidationStep())