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

backup: implemented use of tar+gpg2 instead of only encrypting files

Browse Source
This commit is contained in:
Olivier MEDOC 2013-08-14 10:18:05 +02:00
parent ead479804e
commit fb8748f3e9
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1042,15 +1042,32 @@ def backup_do_copy(appvm, base_backup_dir, files_to_backup, progress_callback =
file["basename"] = os.path.basename(file["path"]) file["basename"] = os.path.basename(file["path"])
vm.run("mkdir -p {0}".format(dest_dir)) vm.run("mkdir -p {0}".format(dest_dir))
if encrypt:
retcode = vm.run(command = "cat > {0}".format(dest_dir + file["basename"] + ".gpg"), passio_popen = True)
compressor = subprocess.Popen (["gpg", "-ac", "--force-mdc", "-o-", file["path"]], stdout=retcode.stdin)
else:
retcode = vm.run(command = "cat > {0}".format(dest_dir + file["basename"] + ".tar.gz"), passio_popen = True)
compressor = subprocess.Popen (["tar", "-PcOz", file["path"]], stdout=retcode.stdin)
retcode = vm.run(command = "cat > {0}".format(dest_dir + file["basename"]), passio_popen = True)
if encrypt:
compressor = subprocess.Popen (["tar", "-PcO",'--checkpoint=10000', file["path"]],stdout=subprocess.PIPE)
encryptor = subprocess.Popen (["gpg2", "-ac", "--force-mdc", "-o-"], stdin=compressor.stdout, stdout=retcode.stdin)
encryptor.wait()
if encryptor.returncode != 0:
raise QubesException("Failed to backup file {0} with error {1}".format(file["basename"]))
else:
compressor = subprocess.Popen (["tar", "-PcOz",'--checkpoint=10000', file["path"]],stdout=retcode.stdin)
'''
for checkpoint in compressor.stderr:
print "Checkpoints:",len(checkpoints)
match = re.search('tar:.*(\d+)',checkpoints)
if match:
print bytes_backedup,total_backup_sz
progress = int(match.group(1)) * 100 / total_backup_sz
progress_callback(progress)
'''
compressor.wait() compressor.wait()
retcode.terminate() retcode.terminate()
if compressor.returncode != 0: if compressor.returncode != 0:
raise QubesException("Failed to backup file {0} with error {1}".format(file["basename"])) raise QubesException("Failed to backup file {0} with error {1}".format(file["basename"]))