backup: cleanup retrieve_proc on failure

marmarek · Jan 5, 2021 · 16ff6d0 · 16ff6d0
1 parent d906fbc
commit 16ff6d0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/qubesadmin/backup/restore.py b/qubesadmin/backup/restore.py
@@ -1520,6 +1520,9 @@ def _restore_vm_data(self, vms_dirs, vms_size, handlers):
                 raise QubesException(
                     "Premature end of archive, the last file was %s" % filename)
         except:
+            with contextlib.suppress(ProcessLookupError):
+                retrieve_proc.terminate()
+            retrieve_proc.wait()
             to_extract.put(QUEUE_ERROR)
             extract_proc.join()
             raise