From c42a9124d355b10a6e248a70fb22ef47125cf295 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 5 Feb 2021 16:03:57 +0100 Subject: [PATCH] Fix cleanup with changed image (#2521) --- supervisor/addons/__init__.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/supervisor/addons/__init__.py b/supervisor/addons/__init__.py index fcbc241b5..2be27f014 100644 --- a/supervisor/addons/__init__.py +++ b/supervisor/addons/__init__.py @@ -276,17 +276,18 @@ class AddonManager(CoreSysAttributes): # Update instance last_state: AddonState = addon.state + old_image = addon.image try: await addon.instance.update(store.version, store.image) - - # Cleanup - with suppress(DockerError): - await addon.instance.cleanup() except DockerError as err: raise AddonsError() from err - else: - self.data.update(store) - _LOGGER.info("Add-on '%s' successfully updated", slug) + + _LOGGER.info("Add-on '%s' successfully updated", slug) + self.data.update(store) + + # Cleanup + with suppress(DockerError): + await addon.instance.cleanup(old_image=old_image) # Setup/Fix AppArmor profile await addon.install_apparmor()