Kill storage hook on error

Kozea · Aug 31, 2020 · 3a4a7eb · 3a4a7eb
1 parent 0f74257
commit 3a4a7eb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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: