From b54305bff17bc15733894bc00e7b295b99ba8930 Mon Sep 17 00:00:00 2001
From: Wojtek Porczyk <woju@invisiblethingslab.com>
Date: Tue, 22 Dec 2015 16:26:09 +0100
Subject: [PATCH] qubes: fix qubes-create regression

Previous commit, which changed the handling of qubes.xml again, broke
bootstrapping.
---
 qubes/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qubes/__init__.py b/qubes/__init__.py
index cd375af6..5190ef9f 100644
--- a/qubes/__init__.py
+++ b/qubes/__init__.py
@@ -1278,7 +1278,7 @@ class Qubes(PropertyHolder):
         '''
 
         while True:
-            fd_old = os.open(self._store, os.O_RDWR) # no O_CREAT
+            fd_old = os.open(self._store, os.O_RDWR | os.O_CREAT)
             if os.name == 'posix':
                 fcntl.lockf(fd_old, fcntl.LOCK_EX)
             elif os.name == 'nt':
@@ -1308,7 +1308,6 @@ class Qubes(PropertyHolder):
         # before all buffers are flushed
         fh_new.close()
         os.close(fd_old)
-        del fh
 
 
     @classmethod