Merge 1818e37 into a11482a

xapi-project · Dec 11, 2014 · 5e9dcad · 5e9dcad
2 parents a11482a + 1818e37
commit 5e9dcad
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/drivers/LVHDSR.py b/drivers/LVHDSR.py
@@ -560,11 +560,13 @@ def delete(self, uuid):
             try:
                 lvname = os.path.basename(fileName.replace('-','/').\
                                           replace('//', '-'))
-                os.unlink(os.path.join(self.path, lvname))
-            except Exception, e:
-                util.SMlog("LVHDSR.delete: failed to remove the symlink for " \
-                           "file %s. Error: %s" % (fileName, str(e)))
-                success = False
+                lpath = os.path.join(self.path, lvname)
+                os.unlink(lpath)
+            except OSError, e:
+                if e.errno != errno.ENOENT:
+                    util.SMlog("LVHDSR.delete: failed to remove the symlink for " \
+                               "file %s. Error: %s" % (fileName, str(e)))
+                    success = False
 
         if success:
             try: