Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed DispVM handling in Template Manager

Browse Source 
DispVMs are now correctly excluded from Template Manager.

fixes QubesOS/qubes-issues#4704
fixes QubesOS/qubes-issues#4703
This commit is contained in:
Marta Marczykowska-Górecka 2019-01-14 14:57:00 +01:00
parent 3e01fd202e
commit b7cf59c134
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesmanager/template_manager.py
View File

@ -83,7 +83,8 @@ class TemplateManagerWindow(
self.change_all_combobox.addItem(template)
vms_with_templates = [vm for vm in self.qubes_app.domains
if getattr(vm, 'template', None)]
if getattr(vm, 'template', None) and
vm.klass != 'DispVM']
self.vm_list.setColumnCount(len(column_names))
self.vm_list.setRowCount(len(vms_with_templates))
@ -127,7 +128,7 @@ class TemplateManagerWindow(
self.timers.remove(timer)
try:
vm = self.qubes_app.domains[vm_name]
if not getattr(vm, 'template', None):
if not getattr(vm, 'template', None) or vm.klass == 'DispVM':
return
except (exc.QubesException, KeyError):
return # it was a dispVM that crashed on start