Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 16:37:52 +01:00
Code Issues Projects Releases Wiki Activity

[core] Fix package merging with lists of primitives (#6952)

Browse Source
This commit is contained in:
Jesse Hills 2024-06-21 13:09:00 +12:00 committed by GitHub
parent 6f074d3692
commit 8045b889d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/config_helpers.py
View File

@ -58,17 +58,21 @@ def merge_config(full_old, full_new):
ids = { ids = {
v_id: i v_id: i
for i, v in enumerate(res) for i, v in enumerate(res)
if (v_id := v.get(CONF_ID)) and isinstance(v_id, str) if isinstance(v, dict)
and (v_id := v.get(CONF_ID))
and isinstance(v_id, str)
} }
extend_ids = { extend_ids = {
v_id.value: i v_id.value: i
for i, v in enumerate(res) for i, v in enumerate(res)
if (v_id := v.get(CONF_ID)) and isinstance(v_id, Extend) if isinstance(v, dict)
and (v_id := v.get(CONF_ID))
and isinstance(v_id, Extend)
} }
ids_to_delete = [] ids_to_delete = []
for v in new: for v in new:
if new_id := v.get(CONF_ID): if isinstance(v, dict) and (new_id := v.get(CONF_ID)):
if isinstance(new_id, Extend): if isinstance(new_id, Extend):
new_id = new_id.value new_id = new_id.value
if new_id in ids: if new_id in ids: