From bcf59579f16273e17a6c318d1db28b7e5c210525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 19 Feb 2021 14:02:53 +0100
Subject: [PATCH] qvm-template-postprocess: treat missing appmenus files as
 warnings only

Do not fail if *-whitelisted-appmenus.list files are not included in the
template package, only log an error.

While at it, use pathlib there to make the code a bit nicer.
---
 qubesadmin/tools/qvm_template_postprocess.py | 39 +++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/qubesadmin/tools/qvm_template_postprocess.py b/qubesadmin/tools/qvm_template_postprocess.py
index 3b1976a..d44f704 100644
--- a/qubesadmin/tools/qvm_template_postprocess.py
+++ b/qubesadmin/tools/qvm_template_postprocess.py
@@ -23,6 +23,7 @@
 import asyncio
 import glob
 import os
+import pathlib
 
 import shutil
 import subprocess
@@ -166,16 +167,26 @@ def import_appmenus(vm, source_dir, skip_generate=True):
     # store the whitelists in VM features
     # separated by spaces should be ok as there should be no spaces in the file
     # name according to the FreeDesktop spec
-    with open(os.path.join(source_dir, 'vm-whitelisted-appmenus.list'), 'r') \
-            as fd:
-        vm.features['default-menu-items'] = ' '.join([x.rstrip() for x in fd])
-    with open(os.path.join(source_dir, 'whitelisted-appmenus.list'), 'r') \
-            as fd:
-        vm.features['menu-items'] = ' '.join([x.rstrip() for x in fd])
-    with open(
-            os.path.join(source_dir, 'netvm-whitelisted-appmenus.list'), 'r') \
-            as fd:
-        vm.features['netvm-menu-items'] = ' '.join([x.rstrip() for x in fd])
+    source_dir = pathlib.Path(source_dir)
+    try:
+        with open(source_dir / 'vm-whitelisted-appmenus.list', 'r') as fd:
+            vm.features['default-menu-items'] = \
+                ' '.join([x.rstrip() for x in fd])
+    except FileNotFoundError as e:
+        vm.log.warning('Cannot set default-menu-items, %s not found',
+                       e.filename)
+    try:
+        with open(source_dir / 'whitelisted-appmenus.list', 'r') as fd:
+            vm.features['menu-items'] = ' '.join([x.rstrip() for x in fd])
+    except FileNotFoundError as e:
+        vm.log.warning('Cannot set menu-items, %s not found',
+                       e.filename)
+    try:
+        with open(source_dir / 'netvm-whitelisted-appmenus.list', 'r') as fd:
+            vm.features['netvm-menu-items'] = ' '.join([x.rstrip() for x in fd])
+    except FileNotFoundError as e:
+        vm.log.warning('Cannot set netvm-menu-items, %s not found',
+                       e.filename)
 
     if skip_generate:
         return
@@ -184,11 +195,11 @@ def import_appmenus(vm, source_dir, skip_generate=True):
     # implemented
     try:
         subprocess.check_call(cmd_prefix + ['qvm-appmenus',
-            '--set-default-whitelist={}'.format(os.path.join(source_dir,
-                'vm-whitelisted-appmenus.list')), vm.name])
+            '--set-default-whitelist={!s}'.format(
+                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])
+            '--set-whitelist={!s}'.format(
+                source_dir / 'whitelisted-appmenus.list'), vm.name])
     except subprocess.CalledProcessError as e:
         vm.log.warning('Failed to set default application list: %s', e)