index.py: os.rename() fails on Windows if dstfile already exists.

Hence, we perform an os.unlink on the dstfile if os.rename() receives
an OSError exception, and try again.

diff --git a/index.py b/index.py
index 3860087042c079eb3e5d7d66358fc87a3a2891e6..10ec093596a95b0d18f9c4eed73f59261da98ef4 100644 (file)
--- a/index.py
+++ b/index.py
@@ -195,7 +195,12 @@ class Writer:
         self.f = None
         if f:
             f.close()
-            os.rename(self.tmpname, self.filename)
+            try:
+                os.rename(self.tmpname, self.filename)
+            except OSError:
+                if os.path.exists(self.filename):
+                    os.unlink(self.filename)
+                os.rename(self.tmpname, self.filename)
 
     def _write(self, data):
         self.f.write(data)