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

backup: fix a misplaced passphrase request breaking the backup GUI

Browse Source
This commit is contained in:
Olivier MEDOC 2013-09-28 12:24:33 +02:00
parent a594af02de
commit c2645bcb92
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom0/qvm-core/qubesutils.py
View File

@ -1010,7 +1010,7 @@ def backup_do(base_backup_dir, files_to_backup, progress_callback = None):
progress = bytes_backedup * 100 / total_backup_sz
progress_callback(progress)
def backup_do_copy(base_backup_dir, files_to_backup, progress_callback = None, encrypt=False, appvm=None):
def backup_do_copy(base_backup_dir, files_to_backup, passphrase, progress_callback = None, encrypt=False, appvm=None):
total_backup_sz = 0
for file in files_to_backup:
total_backup_sz += file["size"]
@ -1047,9 +1047,6 @@ def backup_do_copy(base_backup_dir, files_to_backup, progress_callback = None, e
# If not APPVM, STDOUT is a local file
backup_stdout = open(backup_target,'wb')
passphrase = raw_input("Please enter the pass phrase that will be used to encrypt/verify the backup:\n")
passphrase = passphrase.replace("\r","").replace("\n","")
blocks_backedup = 0
progress = blocks_backedup * 11 / total_backup_sz
progress_callback(progress)

5
dom0/qvm-tools/qvm-backup
View File

@ -75,8 +75,11 @@ def main():
if not (prompt == "y" or prompt == "Y"):
exit (0)
passphrase = raw_input("Please enter the pass phrase that will be used to encrypt/verify the backup:\n")
passphrase = passphrase.replace("\r","").replace("\n","")
try:
backup_do_copy(base_backup_dir, files_to_backup, progress_callback=print_progress, encrypt=options.encrypt,appvm=options.appvm)
backup_do_copy(base_backup_dir, files_to_backup, passphrase, progress_callback=print_progress, encrypt=options.encrypt,appvm=options.appvm)
except QubesException as e:
print >>sys.stderr, "ERROR: %s" % str(e)
exit(1)