backup: cleanup retrieve_proc on failure

2021-01-05 03:32:21 +01:00 · 2021-01-05 03:32:21 +01:00 · 16ff6d0552
commit 16ff6d0552
parent d906fbc4bb
1 changed files with 3 additions and 0 deletions
--- a/qubesadmin/backup/restore.py
+++ b/qubesadmin/backup/restore.py
@ -1520,6 +1520,9 @@ class BackupRestore(object):
                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