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

backup: fix get_backup_summary

Browse Source 
QubesOS/qubes-issues#2931
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-20 03:06:32 +02:00
parent 579d90e174
commit 81246cac64
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qubes/backup.py
View File

@ -431,25 +431,25 @@ class Backup(object):
for qid, vm_info in files_to_backup.items(): for qid, vm_info in files_to_backup.items():
summary_line = "" summary_line = ""
fmt = "{{0:>{0}}} |".format(fields_to_display[0]["width"] + 1) fmt = "{{0:>{0}}} |".format(fields_to_display[0]["width"] + 1)
summary_line += fmt.format(vm_info['vm'].name) summary_line += fmt.format(vm_info.vm.name)
fmt = "{{0:>{0}}} |".format(fields_to_display[1]["width"] + 1) fmt = "{{0:>{0}}} |".format(fields_to_display[1]["width"] + 1)
if qid == 0: if qid == 0:
summary_line += fmt.format("User home") summary_line += fmt.format("User home")
elif isinstance(vm_info['vm'], qubes.vm.templatevm.TemplateVM): elif isinstance(vm_info.vm, qubes.vm.templatevm.TemplateVM):
summary_line += fmt.format("Template VM") summary_line += fmt.format("Template VM")
else: else:
summary_line += fmt.format("VM" + (" + Sys" if summary_line += fmt.format("VM" + (" + Sys" if
vm_info['vm'].updateable else "")) vm_info.vm.updateable else ""))
vm_size = vm_info['size'] vm_size = vm_info.size
fmt = "{{0:>{0}}} |".format(fields_to_display[2]["width"] + 1) fmt = "{{0:>{0}}} |".format(fields_to_display[2]["width"] + 1)
summary_line += fmt.format(size_to_human(vm_size)) summary_line += fmt.format(size_to_human(vm_size))
if qid != 0 and vm_info['vm'].is_running(): if qid != 0 and vm_info.vm.is_running():
summary_line += " <-- The VM is running, please shut down it " \ summary_line += " <-- The VM is running, backup will contain " \
"before proceeding with the backup!" "its state from before its start!"
summary += summary_line + "\n" summary += summary_line + "\n"
@ -474,7 +474,7 @@ class Backup(object):
vms_not_for_backup = [vm.name for vm in self.app.domains vms_not_for_backup = [vm.name for vm in self.app.domains
if vm not in self.vms_for_backup] if vm not in self.vms_for_backup]
summary += "VMs not selected for backup:\n - " + "\n - ".join( summary += "VMs not selected for backup:\n - " + "\n - ".join(
sorted(vms_not_for_backup)) sorted(vms_not_for_backup)) + "\n"
return summary return summary