From 9313be30ffa4b9616cb1c52390f6bf6a8cdd6057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 25 Nov 2013 07:19:20 +0100 Subject: [PATCH] appmenus: fix the code for creating standalone VMs ... without source template. Especially HVM and HVM template. --- appmenus-scripts/qubes-core-appmenus.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appmenus-scripts/qubes-core-appmenus.py b/appmenus-scripts/qubes-core-appmenus.py index d2fc76a..894728d 100644 --- a/appmenus-scripts/qubes-core-appmenus.py +++ b/appmenus-scripts/qubes-core-appmenus.py @@ -102,14 +102,14 @@ def QubesVm_create_on_disk(self, verbose, source_template): source_whitelist_filename = 'vm-' + vm_files["appmenus_whitelist"] if self.is_netvm(): source_whitelist_filename = 'netvm-' + vm_files["appmenus_whitelist"] - if os.path.exists(os.path.join(source_template.dir_path, source_whitelist_filename)): + if source_template and os.path.exists(os.path.join(source_template.dir_path, source_whitelist_filename)): if verbose: print >> sys.stderr, "--> Creating default whitelisted apps list: {0}".\ format(self.dir_path + '/' + vm_files["whitelisted_appmenus"]) shutil.copy(os.path.join(source_template.dir_path, source_whitelist_filename), os.path.join(self.dir_path, vm_files["whitelisted_appmenus"])) - if self.updateable: + if source_template and self.updateable: if verbose: print >> sys.stderr, "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}".\ format(source_template.appmenus_templates_dir, self.appmenus_templates_dir)