From 7e759bf73054385eeafdb3dc35712f9e999521da Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 18 Mar 2026 14:28:56 +0100 Subject: [PATCH] Fix Abort exception caught by wrong handler in backup encrypt/decrypt (#165852) Co-authored-by: Claude Opus 4.6 (1M context) --- homeassistant/components/backup/util.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/backup/util.py b/homeassistant/components/backup/util.py index 23e230e8e24..d93290d675c 100644 --- a/homeassistant/components/backup/util.py +++ b/homeassistant/components/backup/util.py @@ -246,6 +246,8 @@ def decrypt_backup( except (DecryptError, SecureTarError, tarfile.TarError) as err: LOGGER.warning("Error decrypting backup: %s", err) error = err + except Abort: + raise except Exception as err: # noqa: BLE001 LOGGER.exception("Unexpected error when decrypting backup: %s", err) error = err @@ -332,8 +334,10 @@ def encrypt_backup( except (EncryptError, SecureTarError, tarfile.TarError) as err: LOGGER.warning("Error encrypting backup: %s", err) error = err + except Abort: + raise except Exception as err: # noqa: BLE001 - LOGGER.exception("Unexpected error when decrypting backup: %s", err) + LOGGER.exception("Unexpected error when encrypting backup: %s", err) error = err else: # Pad the output stream to the requested minimum size