QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appmenus: skip VMs without own directory

Browse Source 
For example Dom0, or VM not created on disk (mostly while running
tests).
This commit is contained in:
Marek Marczykowski-Górecki 2016-09-03 21:12:29 +02:00
parent a72d53ae1b
commit a513b33da3
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qubesappmenus/__init__.py
View File

@ -302,18 +302,20 @@ class AppmenusExtension(qubes.ext.Extension):
@qubes.ext.handler('property-pre-set:name', vm=qubes.vm.qubesvm.QubesVM) @qubes.ext.handler('property-pre-set:name', vm=qubes.vm.qubesvm.QubesVM)
def pre_rename(self, vm, event, prop, *args): def pre_rename(self, vm, event, prop, *args):
if not os.path.exists(vm.dir_path): if not vm.dir_path or not os.path.exists(vm.dir_path):
return return
self.appmenus_remove(vm) self.appmenus_remove(vm)
@qubes.ext.handler('property-set:name', vm=qubes.vm.qubesvm.QubesVM) @qubes.ext.handler('property-set:name', vm=qubes.vm.qubesvm.QubesVM)
def post_rename(self, vm, event, prop, *args): def post_rename(self, vm, event, prop, *args):
if not os.path.exists(vm.dir_path): if not vm.dir_path or not os.path.exists(vm.dir_path):
return return
self.appmenus_create(vm) self.appmenus_create(vm)
@qubes.ext.handler('domain-create-on-disk') @qubes.ext.handler('domain-create-on-disk')
def create_on_disk(self, vm, event): def create_on_disk(self, vm, event):
if not vm.dir_path or not os.path.exists(vm.dir_path):
return
try: try:
source_template = vm.template source_template = vm.template
except AttributeError: except AttributeError:
@ -353,6 +355,8 @@ class AppmenusExtension(qubes.ext.Extension):
@qubes.ext.handler('domain-clone-files') @qubes.ext.handler('domain-clone-files')
def clone_disk_files(self, vm, event, src_vm): def clone_disk_files(self, vm, event, src_vm):
if not vm.dir_path or not os.path.exists(vm.dir_path):
return
if src_vm.updateable and self.templates_dir(vm) is not None and \ if src_vm.updateable and self.templates_dir(vm) is not None and \
self.templates_dir(vm) is not None: self.templates_dir(vm) is not None:
vm.log.info("Copying the template's appmenus templates " vm.log.info("Copying the template's appmenus templates "
@ -394,7 +398,7 @@ class AppmenusExtension(qubes.ext.Extension):
@qubes.ext.handler('property-set:label') @qubes.ext.handler('property-set:label')
def label_setter(self, vm, event, *args): def label_setter(self, vm, event, *args):
if not os.path.exists(vm.dir_path): if not vm.dir_path or not os.path.exists(vm.dir_path):
return return
self.appicons_create(vm, force=True) self.appicons_create(vm, force=True)
@ -424,7 +428,7 @@ class AppmenusExtension(qubes.ext.Extension):
@qubes.ext.handler('property-set:internal') @qubes.ext.handler('property-set:internal')
def on_property_set_internal(self, vm, event, prop, newvalue, *args): def on_property_set_internal(self, vm, event, prop, newvalue, *args):
if not os.path.exists(vm.dir_path): if not vm.dir_path or not os.path.exists(vm.dir_path):
return return
if len(args): if len(args):
oldvalue = args[0] oldvalue = args[0]
@ -437,7 +441,7 @@ class AppmenusExtension(qubes.ext.Extension):
@qubes.ext.handler('backup-get-files') @qubes.ext.handler('backup-get-files')
def files_for_backup(self, vm, event): def files_for_backup(self, vm, event):
if not os.path.exists(vm.dir_path): if not vm.dir_path or not os.path.exists(vm.dir_path):
return return
if vm.internal: if vm.internal:
return return