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

backups: minor reduce code duplication

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-25 00:48:00 +01:00
parent bc59d7e054
commit 7229b78bbf
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/qubesutils.py
View File

@ -1429,6 +1429,13 @@ def restore_vm_dirs (backup_dir, backup_tmpdir, passphrase, vms_dirs, vms,
self.tar2_command = subprocess.Popen(tar2_cmdline, self.tar2_command = subprocess.Popen(tar2_cmdline,
stdin=subprocess.PIPE, stderr=subprocess.PIPE) stdin=subprocess.PIPE, stderr=subprocess.PIPE)
common_args = {
'backup_target': pipe,
'total_backup_sz': self.total_size,
'hmac': None,
'vmproc': self.vmproc,
'addproc': self.tar2_command
}
if self.encrypted: if self.encrypted:
# Start decrypt # Start decrypt
encryptor = subprocess.Popen (["openssl", "enc", encryptor = subprocess.Popen (["openssl", "enc",
@ -1439,24 +1446,13 @@ def restore_vm_dirs (backup_dir, backup_tmpdir, passphrase, vms_dirs, vms,
run_error = wait_backup_feedback( run_error = wait_backup_feedback(
progress_callback=self.compute_progress, progress_callback=self.compute_progress,
in_stream=encryptor.stdout, in_stream=encryptor.stdout, streamproc=encryptor,
streamproc=encryptor, **common_args)
backup_target=pipe,
total_backup_sz=self.total_size,
hmac=None,
vmproc=self.vmproc,
addproc=self.tar2_command)
else: else:
run_error = wait_backup_feedback( run_error = wait_backup_feedback(
progress_callback=self.compute_progress, progress_callback=self.compute_progress,
in_stream=open(filename,"rb"), in_stream=open(filename,"rb"), streamproc=None,
streamproc=None, **common_args)
backup_target=pipe,
total_backup_sz=self.total_size,
hmac=None,
vmproc=self.vmproc,
addproc=self.tar2_command)
pipe.close() pipe.close()