From 0012eb3ac68519eb7a5f55fd1c0df432cc74caf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 25 Jun 2017 15:09:57 +0200
Subject: [PATCH] tools/qvm-template-postprocess: improve error handling

Don't fail the whole process when "just" appmenus import fails.
But if data import fails, remove the VM

Also update for vm.run_service_for_stdio raising CalledProcessError.
---
 qubesadmin/tools/qvm_template_postprocess.py | 28 +++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/qubesadmin/tools/qvm_template_postprocess.py b/qubesadmin/tools/qvm_template_postprocess.py
index d5e985c..0c92306 100644
--- a/qubesadmin/tools/qvm_template_postprocess.py
+++ b/qubesadmin/tools/qvm_template_postprocess.py
@@ -132,12 +132,15 @@ def import_appmenus(vm, source_dir):
 
     # TODO: change this to qrexec calls to GUI VM, when GUI VM will be
     # implemented
-    subprocess.check_call(cmd_prefix + ['qvm-appmenus',
-        '--set-default-whitelist={}'.format(os.path.join(source_dir,
-            'vm-whitelisted-appmenus.list')), vm.name])
-    subprocess.check_call(cmd_prefix + ['qvm-appmenus',
-        '--set-whitelist={}'.format(os.path.join(source_dir,
-            'whitelisted-appmenus.list')), vm.name])
+    try:
+        subprocess.check_call(cmd_prefix + ['qvm-appmenus',
+            '--set-default-whitelist={}'.format(os.path.join(source_dir,
+                'vm-whitelisted-appmenus.list')), vm.name])
+        subprocess.check_call(cmd_prefix + ['qvm-appmenus',
+            '--set-whitelist={}'.format(os.path.join(source_dir,
+                'whitelisted-appmenus.list')), vm.name])
+    except subprocess.CalledProcessError as e:
+        vm.log.warning('Failed to set default application list: %s', e)
 
 
 def post_install(args):
@@ -162,7 +165,12 @@ def post_install(args):
             label=qubesadmin.config.defaults['template_label'])
 
     vm.log.info('Importing data')
-    import_root_img(vm, args.dir)
+    try:
+        import_root_img(vm, args.dir)
+    except:
+        # if data import fails, remove half-created VM
+        del app.domains[vm.name]
+        raise
     import_appmenus(vm, args.dir)
 
     if not args.skip_start:
@@ -178,7 +186,7 @@ def post_install(args):
         else:
             try:
                 vm.run_service_for_stdio('qubes.PostInstall')
-            except qubesadmin.exc.QubesVMError:
+            except subprocess.CalledProcessError:
                 vm.log.error('qubes.PostInstall service failed')
             vm.shutdown()
             if have_events:
@@ -198,8 +206,8 @@ def post_install(args):
                     timeout -= 1
                 if not vm.is_halted():
                     vm.kill()
-
-        vm.netvm = qubesadmin.DEFAULT
+        finally:
+            vm.netvm = qubesadmin.DEFAULT
 
     return 0