From 91639d7933755a68d0d521f290a057ca33323736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 19 Jan 2018 04:50:04 +0100 Subject: [PATCH] app: define values for default_dispvm=None, updatevm=None If those VMs are not set, default to None, instead of throwing AttributeError. Fixes QubesOS/qubes-issues#3475 --- qubes/app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qubes/app.py b/qubes/app.py index 48561bd1..58129aad 100644 --- a/qubes/app.py +++ b/qubes/app.py @@ -729,7 +729,7 @@ class Qubes(qubes.PropertyHolder): vmclass=qubes.vm.templatevm.TemplateVM, doc='Default template for new AppVMs') updatevm = qubes.VMProperty('updatevm', load_stage=3, - allow_none=True, + default=None, allow_none=True, doc='''Which VM to use as `yum` proxy for updating AdminVM and TemplateVMs''') clockvm = qubes.VMProperty('clockvm', load_stage=3, @@ -738,6 +738,7 @@ class Qubes(qubes.PropertyHolder): default_kernel = qubes.property('default_kernel', load_stage=3, doc='Which kernel to use when not overriden in VM') default_dispvm = qubes.VMProperty('default_dispvm', load_stage=3, + default=None, doc='Default DispVM base for service calls', allow_none=True) default_pool = qubes.property('default_pool', load_stage=3,