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

appmenus: fix handling custom templates

Browse Source 
QubesOS/qubes-issues#1897
This commit is contained in:
Marek Marczykowski-Górecki 2016-04-20 02:23:28 +02:00
parent f688cba49c
commit 0fbc644fd9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
qubesappmenus/__init__.py
View File

@ -306,10 +306,12 @@ class AppmenusExtension(qubes.ext.Extension):
@qubes.ext.handler('domain-create-on-disk') @qubes.ext.handler('domain-create-on-disk')
def create_on_disk(self, vm, event, source_template=None): def create_on_disk(self, vm, event, source_template=None):
if vm.updateable and source_template is None:
os.mkdir(self.templates_dir(vm))
os.mkdir(self.template_icons_dir(vm))
if vm.hvm and source_template is None: if vm.hvm and source_template is None:
vm.log.info("Creating appmenus directory: {0}".format( vm.log.info("Creating appmenus directory: {0}".format(
self.templates_dir(vm))) self.templates_dir(vm)))
os.mkdir(self.templates_dir(vm))
shutil.copy(AppmenusPaths.appmenu_start_hvm_template, shutil.copy(AppmenusPaths.appmenu_start_hvm_template,
self.templates_dir(vm)) self.templates_dir(vm))
@ -324,21 +326,16 @@ class AppmenusExtension(qubes.ext.Extension):
os.path.join(source_template.dir_path, source_whitelist_filename), os.path.join(source_template.dir_path, source_whitelist_filename),
os.path.join(vm.dir_path, AppmenusSubdirs.whitelist)) os.path.join(vm.dir_path, AppmenusSubdirs.whitelist))
if source_template and vm.updateable: if vm.updateable:
vm.log.info("--> Copying the template's appmenus templates " vm.log.info("Creating/copying appmenus templates")
"dir:\n{0} ==>\n{1}". if source_template and os.path.isdir(self.templates_dir(
format(self.templates_dir(source_template), source_template)):
self.templates_dir(vm)))
if os.path.isdir(self.templates_dir(source_template)):
shutil.copytree(self.templates_dir(source_template), shutil.copytree(self.templates_dir(source_template),
self.templates_dir(vm)) self.templates_dir(vm))
else: if source_template and os.path.isdir(self.template_icons_dir(
os.mkdir(self.templates_dir(vm)) source_template)):
if os.path.isdir(self.template_icons_dir(source_template)):
shutil.copytree(self.template_icons_dir(source_template), shutil.copytree(self.template_icons_dir(source_template),
self.template_icons_dir(vm)) self.template_icons_dir(vm))
else:
os.mkdir(self.template_icons_dir(vm))
# Create appmenus # Create appmenus
self.appicons_create(vm) self.appicons_create(vm)
@ -346,7 +343,7 @@ 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 src_vm.updateable and src_vm.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 "
"dir:\n{0} ==>\n{1}". "dir:\n{0} ==>\n{1}".
@ -355,7 +352,7 @@ class AppmenusExtension(qubes.ext.Extension):
shutil.copytree(self.templates_dir(src_vm), shutil.copytree(self.templates_dir(src_vm),
self.templates_dir(vm)) self.templates_dir(vm))
if src_vm.updateable and src_vm.template_icons_dir(vm) is not None \ if src_vm.updateable and self.template_icons_dir(vm) is not None \
and self.template_icons_dir(vm) is not None and \ and self.template_icons_dir(vm) is not None and \
os.path.isdir(self.template_icons_dir(src_vm)): os.path.isdir(self.template_icons_dir(src_vm)):
vm.log.info("Copying the template's appmenus " vm.log.info("Copying the template's appmenus "
@ -431,9 +428,11 @@ class AppmenusExtension(qubes.ext.Extension):
if vm.updateable: if vm.updateable:
yield self.templates_dir(vm) yield self.templates_dir(vm)
yield self.template_icons_dir(vm) yield self.template_icons_dir(vm)
yield os.path.join(vm.dir_path, AppmenusSubdirs.whitelist) if os.path.exists(self.whitelist_path(vm)):
yield self.whitelist_path(vm)
if vm.is_template(): if vm.is_template():
for whitelist in ( for whitelist in (
'vm-' + AppmenusSubdirs.whitelist, 'vm-' + AppmenusSubdirs.whitelist,
'netvm-' + AppmenusSubdirs.whitelist): 'netvm-' + AppmenusSubdirs.whitelist):
yield os.path.join(vm.dir_path, whitelist) if os.path.exists(os.path.join(vm.dir_path, whitelist)):
yield os.path.join(vm.dir_path, whitelist)