From 4e1f6b5bd59232f22d766d1ce7549f84a410c5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 4 Sep 2015 01:57:59 +0200 Subject: [PATCH] core: use vm.absolute_path to parse paths in qubes.xml This makes easier to handle some corner cases. qubesos/qubes-issues#1124 Reported by @doncohen, thanks @wyory for providing more details. --- appmenus-scripts/qubes-core-appmenus.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appmenus-scripts/qubes-core-appmenus.py b/appmenus-scripts/qubes-core-appmenus.py index 37ba965..9f752a9 100644 --- a/appmenus-scripts/qubes-core-appmenus.py +++ b/appmenus-scripts/qubes-core-appmenus.py @@ -51,22 +51,21 @@ system_path['appmenu_remove_cmd'] = \ def QubesVm_get_attrs_config(self, attrs): attrs["appmenus_templates_dir"] = { "func": lambda x: - os.path.join(self.dir_path, vm_files["appmenus_templates_subdir"]) + self.absolute_path(vm_files["appmenus_templates_subdir"], None) if self.updateable else (self.template.appmenus_templates_dir if self.template is not None else None) } attrs["appmenus_template_icons_dir"] = { "func": lambda x: - os.path.join(self.dir_path, - vm_files["appmenus_template_icons_subdir"]) + self.absolute_path(vm_files["appmenus_template_icons_subdir"], None) if self.updateable else (self.template.appmenus_template_icons_dir if self.template is not None else None) } attrs["appmenus_icons_dir"] = { "func": lambda x: - os.path.join(self.dir_path, vm_files["appmenus_icons_subdir"])} + self.absolute_path(vm_files["appmenus_icons_subdir"], None)} return attrs