From 3a4a7eb3e419e9505d7c9f825e2710e177003fae Mon Sep 17 00:00:00 2001
From: Unrud <unrud@outlook.com>
Date: Mon, 31 Aug 2020 13:54:48 +0200
Subject: [PATCH] Kill storage hook on error

---
 radicale/storage/multifilesystem/lock.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/radicale/storage/multifilesystem/lock.py b/radicale/storage/multifilesystem/lock.py
index e3615e91a..81821f2a4 100644
--- a/radicale/storage/multifilesystem/lock.py
+++ b/radicale/storage/multifilesystem/lock.py
@@ -62,7 +62,11 @@ def acquire_lock(self, mode, user=None):
                     stdout=subprocess.PIPE if debug else subprocess.DEVNULL,
                     stderr=subprocess.PIPE if debug else subprocess.DEVNULL,
                     shell=True, universal_newlines=True, cwd=folder)
-                stdout_data, stderr_data = p.communicate()
+                try:
+                    stdout_data, stderr_data = p.communicate()
+                except BaseException:  # e.g. KeyboardInterrupt or SystemExit
+                    p.kill()
+                    raise
                 if stdout_data:
                     logger.debug("Captured stdout hook:\n%s", stdout_data)
                 if stderr_data: