Merge branch 'dev' of ssh://raid.local.hde.co.jp/hde/karesansui/karesansui into dev

[karesansui/karesansui.git] / karesansui / lib / virt / virt.py

diff --git a/karesansui/lib/virt/virt.py b/karesansui/lib/virt/virt.py
index b14b743..72b5840 100644 (file)
--- a/karesansui/lib/virt/virt.py
+++ b/karesansui/lib/virt/virt.py
@@ -950,11 +950,15 @@ class KaresansuiVirtConnection:
         else:
             vol_path = "%s/%s" % (domains_dir, volume)
 
-        self.destroy_guest(name)
+        try:
+            self.destroy_guest(name)
+        except libvirt.libvirtError, e:
+            self.logger.info("Could not remove the guest. - name=%s" % name)
+
         try:
             self.guest.undefine()
         except:
-            pass
+            self.logger.info("Guests definition could not be removed. - name=%s" % name)
 
         import shutil
         if os.path.islink(vol_path):