github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-14 08:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'crash-handler-dual-core' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-04-08 09:34:33 -10:00
parent ca61dc5d69 3b11be2123
commit d9ebe1e1e7
17 changed files with 187 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/merge_component_configs.py
+6
View File
@@ -288,6 +288,9 @@ def merge_component_configs(
for pkg_name, pkg_value in list(packages_value.items()):
if pkg_name in common_bus_packages:
continue
# Resolve deferred !include files before checking type
if isinstance(pkg_value, yaml_util.IncludeFile):
pkg_value = pkg_value.load()
if not isinstance(pkg_value, dict):
continue
# Component-specific package - expand its content into top level
@@ -295,6 +298,9 @@ def merge_component_configs(
elif isinstance(packages_value, list):
# List format - expand all package includes
for pkg_value in packages_value:
# Resolve deferred !include files before checking type
if isinstance(pkg_value, yaml_util.IncludeFile):
pkg_value = pkg_value.load()
if not isinstance(pkg_value, dict):
continue
comp_data = merge_config(comp_data, pkg_value)