Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backup: wait for process termination in restore header phase

Browse Source 
One more race condition, which could cause qvm-backup-restore hang.
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-09 18:56:08 +01:00
parent 319158d5b1
commit 3666d6ced9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/qubesutils.py
View File

@ -1630,9 +1630,9 @@ def backup_restore_header(restore_target, passphrase, encrypt=False, appvm=None)
tarhead_command.wait() tarhead_command.wait()
if encryptor: if encryptor:
if encryptor.poll() != 0: if encryptor.wait() != 0:
raise QubesException("ERROR: unable to decrypt file {0}".format(filename)) raise QubesException("ERROR: unable to decrypt file {0}".format(filename))
if tarhead_command.poll() != 0: if tarhead_command.wait() != 0:
raise QubesException("ERROR: unable to extract the qubes.xml file. Is archive encrypted?") raise QubesException("ERROR: unable to extract the qubes.xml file. Is archive encrypted?")
return (backup_tmpdir,"qubes.xml") return (backup_tmpdir,"qubes.xml")