From b7cf59c134639f3d265a7502f6090f2f25251680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Mon, 14 Jan 2019 14:57:00 +0100 Subject: [PATCH] Fixed DispVM handling in Template Manager DispVMs are now correctly excluded from Template Manager. fixes QubesOS/qubes-issues#4704 fixes QubesOS/qubes-issues#4703 --- qubesmanager/template_manager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qubesmanager/template_manager.py b/qubesmanager/template_manager.py index 7e646c4..88e1a08 100644 --- a/qubesmanager/template_manager.py +++ b/qubesmanager/template_manager.py @@ -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