1
0
mirror of https://github.com/esphome/esphome.git synced 2024-12-02 13:58:48 +01:00

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

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

View File

@ -58,17 +58,21 @@ def merge_config(full_old, full_new):
ids = {
v_id: i
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 = {
v_id.value: i
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 = []
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):
new_id = new_id.value
if new_id in ids: