From bf140ae17574b40ab8f2226b2aff2bf36b0e2cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 8 Aug 2016 00:43:12 +0200 Subject: [PATCH] appmenus: misc API sync with core-admin - there is no longer vm.is_netvm/is_disposablevm. - 'domain-create-on-disk' even have no longer 'source_template' argument --- qubesappmenus/__init__.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qubesappmenus/__init__.py b/qubesappmenus/__init__.py index 9c030ef..856f2b2 100644 --- a/qubesappmenus/__init__.py +++ b/qubesappmenus/__init__.py @@ -29,6 +29,7 @@ import dbus import pkg_resources import qubes.ext +import qubes.vm.dispvm import qubesimgconverter @@ -125,7 +126,7 @@ class AppmenusExtension(qubes.ext.Extension): if vm.internal: return - if vm.is_disposablevm(): + if isinstance(vm, qubes.vm.dispvm.DispVM): return vm.log.info("Creating appmenus") @@ -255,7 +256,7 @@ class AppmenusExtension(qubes.ext.Extension): if vm.internal: return - if vm.is_disposablevm(): + if isinstance(vm, qubes.vm.dispvm.DispVM): return whitelist = self.whitelist_path(vm) @@ -309,7 +310,11 @@ class AppmenusExtension(qubes.ext.Extension): self.appmenus_create(vm) @qubes.ext.handler('domain-create-on-disk') - def create_on_disk(self, vm, event, source_template=None): + def create_on_disk(self, vm, event): + try: + source_template = vm.template + except AttributeError: + source_template = None if vm.updateable and source_template is None: os.mkdir(self.templates_dir(vm)) os.mkdir(self.template_icons_dir(vm)) @@ -320,8 +325,6 @@ class AppmenusExtension(qubes.ext.Extension): self.templates_dir(vm)) source_whitelist_filename = 'vm-' + AppmenusSubdirs.whitelist - if vm.is_netvm(): - source_whitelist_filename = 'netvm-' + AppmenusSubdirs.whitelist if source_template and os.path.exists( os.path.join(source_template.dir_path, source_whitelist_filename)): vm.log.info("Creating default whitelisted apps list: {0}".