From 5733db94aa98ea3665bb7d2cfb56ffa0bbddbadb Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 25 Feb 2025 09:10:27 +0100 Subject: [PATCH] Revert "Fix add-on store reset" This reverts commit da8c6cf1117e1b3d9522a293912376f5d455b389. --- supervisor/resolution/fixups/store_execute_reset.py | 5 +---- supervisor/utils/__init__.py | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/supervisor/resolution/fixups/store_execute_reset.py b/supervisor/resolution/fixups/store_execute_reset.py index d5736b40b..45bf15c7f 100644 --- a/supervisor/resolution/fixups/store_execute_reset.py +++ b/supervisor/resolution/fixups/store_execute_reset.py @@ -1,6 +1,5 @@ """Helpers to check and fix issues with free space.""" -from functools import partial import logging from ...coresys import CoreSys @@ -41,9 +40,7 @@ class FixupStoreExecuteReset(FixupBase): _LOGGER.warning("Can't find store %s for fixup", reference) return - await self.sys_run_in_executor( - partial(remove_folder, folder=repository.git.path, content_only=True) - ) + await self.sys_run_in_executor(remove_folder, repository.git.path) # Load data again try: diff --git a/supervisor/utils/__init__.py b/supervisor/utils/__init__.py index e402850da..245d7b423 100644 --- a/supervisor/utils/__init__.py +++ b/supervisor/utils/__init__.py @@ -106,7 +106,8 @@ def remove_folder( except OSError as err: _LOGGER.exception("Can't remove folder %s: %s", folder, err) except subprocess.CalledProcessError as procerr: - _LOGGER.critical("Can't remove folder %s: %s", folder, procerr.stderr.strip()) + _LOGGER.error("Can't remove folder %s: %s", folder, procerr.stderr.strip()) + raise procerr def remove_folder_with_excludes(