From 1a5ad23a10bc955651ae418c6fb4ef19af6907fe Mon Sep 17 00:00:00 2001 From: Aaron Collins Date: Sun, 8 Oct 2023 01:32:27 +1300 Subject: [PATCH] Verify config entry id on Daikin device removal (#101507) --- homeassistant/components/daikin/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/daikin/__init__.py b/homeassistant/components/daikin/__init__.py index eda7976e572..cc79f2ae233 100644 --- a/homeassistant/components/daikin/__init__.py +++ b/homeassistant/components/daikin/__init__.py @@ -168,9 +168,12 @@ async def async_migrate_unique_id( ent_reg, duplicate.id, True ) for entity in duplicate_entities: - ent_reg.async_remove(entity.entity_id) + if entity.config_entry_id == config_entry.entry_id: + ent_reg.async_remove(entity.entity_id) - dev_reg.async_remove_device(duplicate.id) + dev_reg.async_update_device( + duplicate.id, remove_config_entry_id=config_entry.entry_id + ) # Migrate devices for device_entry in dr.async_entries_for_config_entry(