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

backup: improved error handling during restore

Browse Source
This commit is contained in:
Olivier MEDOC 2013-11-19 13:41:38 +01:00 committed by Marek Marczykowski-Górecki
parent e875ae9d06
commit 51f119326b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/qubesutils.py
View File

@ -1599,20 +1599,23 @@ def backup_restore_header(restore_target, passphrase, encrypt=False, appvm=None)
command.wait() command.wait()
if not os.path.exists(os.path.join(backup_tmpdir,filename+".hmac")): # Let the time to vmproc process to crash
raise QubesException("ERROR: header not extracted correctly: {0}".format(os.path.join(backup_tmpdir,filename+".hmac"))) time.sleep(2)
if vmproc and vmproc.poll() != None and vmproc.poll() != 0: if vmproc and vmproc.poll() != None and vmproc.poll() != 0:
error = vmproc.stderr.read() error = vmproc.stderr.read()
print error print error
print vmproc.poll(),command.poll() print vmproc.poll(),command.poll()
raise QubesException("ERROR: VM error retrieving backup headers") raise QubesException("ERROR: AppVM error retrieving backup headers: {0}".format(error))
elif command.returncode not in [0,-15,122]: elif command.returncode not in [0,-15,122]:
error = command.stderr.read() error = command.stderr.read()
print error print error
print vmproc.poll(),command.poll() print vmproc.poll(),command.poll()
raise QubesException("ERROR: retrieving backup headers:{0}".format(error)) raise QubesException("ERROR: retrieving backup headers:{0}".format(error))
if not os.path.exists(os.path.join(backup_tmpdir,filename+".hmac")):
raise QubesException("ERROR: header not extracted correctly: {0}".format(os.path.join(backup_tmpdir,filename+".hmac")))
if vmproc and vmproc.poll() == None: if vmproc and vmproc.poll() == None:
vmproc.terminate() vmproc.terminate()
vmproc.wait() vmproc.wait()
@ -1639,10 +1642,9 @@ def backup_restore_header(restore_target, passphrase, encrypt=False, appvm=None)
encryptor = None encryptor = None
tarhead_command = subprocess.Popen(['tar', '--tape-length','1000000', '-xvf', os.path.join(backup_tmpdir,filename)]) tarhead_command = subprocess.Popen(['tar', '--tape-length','1000000', '-xvf', os.path.join(backup_tmpdir,filename)])
tarhead_command.wait()
if encryptor: if encryptor:
if encryptor.wait() != 0: if encryptor.wait() != 0:
raise QubesException("ERROR: unable to decrypt file {0}".format(filename)) raise QubesException("ERROR: unable to decrypt file {0}. Bad password or unencrypted archive?".format(filename))
if tarhead_command.wait() != 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?")