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

backup: fix setting backup qubes.xml attributes

Browse Source 
Cannot compare QubesVm objects, because we have different instances of
QubesVmCollection. So compare QID instead.
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-09 16:46:06 +01:00
parent a56ceb92c5
commit 34b03fe2b3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/qubesutils.py
View File

@ -789,12 +789,11 @@ def backup_prepare(base_backup_dir, vms_list = None, exclude_list = [], print_ca
if exclude_list is None: if exclude_list is None:
exclude_list = [] exclude_list = []
qvm_collection = None qvm_collection = QubesVmCollection()
if vms_list is None: qvm_collection.lock_db_for_writing()
qvm_collection = QubesVmCollection() qvm_collection.load()
qvm_collection.lock_db_for_writing()
qvm_collection.load()
if vms_list is None:
all_vms = [vm for vm in qvm_collection.values()] all_vms = [vm for vm in qvm_collection.values()]
selected_vms = [vm for vm in all_vms if vm.include_in_backups] selected_vms = [vm for vm in all_vms if vm.include_in_backups]
appvms_to_backup = [vm for vm in selected_vms if vm.is_appvm() and not vm.internal] appvms_to_backup = [vm for vm in selected_vms if vm.is_appvm() and not vm.internal]
@ -910,10 +909,11 @@ def backup_prepare(base_backup_dir, vms_list = None, exclude_list = [], print_ca
print_callback(s) print_callback(s)
# Initialize backup flag on all VMs # Initialize backup flag on all VMs
vms_for_backup_qid = [vm.qid for vm in vms_for_backup]
for vm in qvm_collection.values(): for vm in qvm_collection.values():
vm.backup_content = False vm.backup_content = False
if vm in vms_for_backup: if vm.qid in vms_for_backup_qid:
vm.backup_content = True vm.backup_content = True
vm.backup_size = vm.get_disk_utilization() vm.backup_size = vm.get_disk_utilization()
vm.backup_path = vm.dir_path.split(os.path.normpath(system_path["qubes_base_dir"])+"/")[1] vm.backup_path = vm.dir_path.split(os.path.normpath(system_path["qubes_base_dir"])+"/")[1]