From d1abb37a5fe38df046bee9bda74f6ec7fc33c869 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@mimuw.edu.pl>
Date: Wed, 6 Apr 2011 23:30:14 +0200
Subject: [PATCH] Do not fail if cannot remove VM from xen store just before
 adding it again (#204)

---
 dom0/qvm-core/qubes.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 230f4889..27d2a667 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -372,7 +372,11 @@ class QubesVm(object):
             self.session_metrics = None
 
     def update_xen_storage(self):
-        self.remove_from_xen_storage()
+        try:
+            self.remove_from_xen_storage()
+        except OSError as ex:
+            print "WARNING: {0}. Continuing anyway...".format(str(ex))
+            pass
         self.add_to_xen_storage()
         if not dry_run and xend_session.session is not None:
             self.refresh_xend_session()