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

backups: Fix backup's passphrase unicode encoding issue

Browse Source
This commit is contained in:
Danny Fullerton 2014-02-05 06:51:47 +01:00 committed by Marek Marczykowski-Górecki
parent 7278102aef
commit 8dbc417642
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backup.py
View File

@ -382,6 +382,7 @@ def backup_do(base_backup_dir, files_to_backup, passphrase,
compressed=False, hmac_algorithm=DEFAULT_HMAC_ALGORITHM,
crypto_algorithm=DEFAULT_CRYPTO_ALGORITHM):
total_backup_sz = 0
passphrase = passphrase.encode('utf-8')
for file in files_to_backup:
total_backup_sz += file["size"]
@ -923,6 +924,7 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
print_callback("Working in temporary dir:"+restore_tmpdir)
print_callback("Extracting data: " + size_to_human(vms_size)+" to restore")
passphrase = passphrase.encode('utf-8')
header_data = None
vmproc = None
if appvm != None: