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

backups: fix tar output handling

Browse Source 
Tar print the filename right _before_ processing the file, so wait for
the next filename before processing actual file.
This commit is contained in:
Marek Marczykowski-Górecki 2014-02-01 14:03:26 +01:00
parent 75c0e775a4
commit 038877d35d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/backup.py
View File

@ -967,11 +967,13 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
expect_tar_error = False expect_tar_error = False
to_extract = Queue() to_extract = Queue()
nextfile = None
# If want to analyze backup header, do it now # If want to analyze backup header, do it now
if vms_dirs and vms_dirs[0] == HEADER_FILENAME: if vms_dirs and vms_dirs[0] == HEADER_FILENAME:
filename = filelist_pipe.readline().strip() filename = filelist_pipe.readline().strip()
hmacfile = filelist_pipe.readline().strip() hmacfile = filelist_pipe.readline().strip()
nextfile = filelist_pipe.readline().strip()
if BACKUP_DEBUG: if BACKUP_DEBUG:
print_callback("Got backup header and hmac: %s, %s" % (filename, print_callback("Got backup header and hmac: %s, %s" % (filename,
@ -1042,6 +1044,9 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
try: try:
filename = None filename = None
while True: while True:
if nextfile is not None:
filename = nextfile
else:
filename = filelist_pipe.readline().strip() filename = filelist_pipe.readline().strip()
if BACKUP_DEBUG: if BACKUP_DEBUG:
@ -1051,6 +1056,12 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
break break
hmacfile = filelist_pipe.readline().strip() hmacfile = filelist_pipe.readline().strip()
# if reading archive directly with tar, wait for next filename -
# tar prints filename before processing it, so wait for the next one to be
# sure that whole file was extracted
if not appvm:
nextfile = filelist_pipe.readline().strip()
if BACKUP_DEBUG: if BACKUP_DEBUG:
print_callback("Getting hmac:"+hmacfile) print_callback("Getting hmac:"+hmacfile)
if not hmacfile or hmacfile=="EOF": if not hmacfile or hmacfile=="EOF":