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

backups: simplify EOL markers handling

Browse Source 
Let the python do it right.
This commit is contained in:
Marek Marczykowski-Górecki 2014-02-01 14:02:38 +01:00
parent a17b7f584d
commit 75c0e775a4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/backup.py
View File

@ -970,8 +970,8 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
# 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(" \t\r\n") filename = filelist_pipe.readline().strip()
hmacfile = filelist_pipe.readline().strip(" \t\r\n") hmacfile = 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,7 +1042,7 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
try: try:
filename = None filename = None
while True: while True:
filename = filelist_pipe.readline().strip(" \t\r\n") filename = filelist_pipe.readline().strip()
if BACKUP_DEBUG: if BACKUP_DEBUG:
print_callback("Getting new file:"+filename) print_callback("Getting new file:"+filename)
@ -1050,7 +1050,7 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
if not filename or filename=="EOF": if not filename or filename=="EOF":
break break
hmacfile = filelist_pipe.readline().strip(" \t\r\n") hmacfile = 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":
@ -1117,7 +1117,7 @@ def backup_restore_set_defaults(options):
return options return options
def load_hmac(hmac): def load_hmac(hmac):
hmac = hmac.strip(" \t\r\n").split("=") hmac = hmac.strip().split("=")
if len(hmac) > 1: if len(hmac) > 1:
hmac = hmac[1].strip() hmac = hmac[1].strip()
else: else: