From da8c6cf1117e1b3d9522a293912376f5d455b389 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 25 Feb 2025 08:57:11 +0100 Subject: [PATCH] Fix add-on store reset Make sure that add-on store resets do not delete the root folder. This is important so that successive reset attempts do not fail (the directory passed to `remove_folder` must exist, otherwise find fails with an non-zero exit code). While at it, handle find errors properly and report errors as critical. --- supervisor/resolution/fixups/store_execute_reset.py | 5 ++++- supervisor/utils/__init__.py | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/supervisor/resolution/fixups/store_execute_reset.py b/supervisor/resolution/fixups/store_execute_reset.py index 45bf15c7f..d5736b40b 100644 --- a/supervisor/resolution/fixups/store_execute_reset.py +++ b/supervisor/resolution/fixups/store_execute_reset.py @@ -1,5 +1,6 @@ """Helpers to check and fix issues with free space.""" +from functools import partial import logging from ...coresys import CoreSys @@ -40,7 +41,9 @@ class FixupStoreExecuteReset(FixupBase): _LOGGER.warning("Can't find store %s for fixup", reference) return - await self.sys_run_in_executor(remove_folder, repository.git.path) + await self.sys_run_in_executor( + partial(remove_folder, folder=repository.git.path, content_only=True) + ) # Load data again try: diff --git a/supervisor/utils/__init__.py b/supervisor/utils/__init__.py index 245d7b423..e402850da 100644 --- a/supervisor/utils/__init__.py +++ b/supervisor/utils/__init__.py @@ -106,8 +106,7 @@ def remove_folder( except OSError as err: _LOGGER.exception("Can't remove folder %s: %s", folder, err) except subprocess.CalledProcessError as procerr: - _LOGGER.error("Can't remove folder %s: %s", folder, procerr.stderr.strip()) - raise procerr + _LOGGER.critical("Can't remove folder %s: %s", folder, procerr.stderr.strip()) def remove_folder_with_excludes(