From 2a4af124f8a6d3692364eedf99064cb201d98627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 25 Nov 2016 00:19:27 +0100
Subject: [PATCH] qubes/app: don't fail on saving qubes.xml when 'qubes' group
 isn't there

---
 qubes/app.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qubes/app.py b/qubes/app.py
index 8df36dc5..65ad12fa 100644
--- a/qubes/app.py
+++ b/qubes/app.py
@@ -809,8 +809,12 @@ class Qubes(qubes.PropertyHolder):
         lxml.etree.ElementTree(self.__xml__()).write(
             fh_new, encoding='utf-8', pretty_print=True)
         fh_new.flush()
-        os.chmod(fh_new.name, 0o660)
-        os.chown(fh_new.name, -1, grp.getgrnam('qubes').gr_gid)
+        try:
+            os.chown(fh_new.name, -1, grp.getgrnam('qubes').gr_gid)
+            os.chmod(fh_new.name, 0o660)
+        except KeyError:  # group 'qubes' not found
+            # don't change mode if no 'qubes' group in the system
+            pass
         os.rename(fh_new.name, self._store)
 
         # update stored mtime, in case of multiple save() calls without