From 190c2259669b33e42cc51f8d04f5bfabfc5f8ffd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Nov 2012 12:02:58 +0530
Subject: [PATCH] ...

---
 src/calibre/utils/filenames.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py
index ee86088da1..22ae1a9306 100644
--- a/src/calibre/utils/filenames.py
+++ b/src/calibre/utils/filenames.py
@@ -278,6 +278,12 @@ class WindowsAtomicFolderMove(object):
         for x in os.listdir(path):
             f = os.path.normcase(os.path.abspath(os.path.join(path, x)))
             if not os.path.isfile(f): continue
+            try:
+                # Ensure the file is not read-only
+                win32file.SetFileAttributes(f, win32file.FILE_ATTRIBUTE_NORMAL)
+            except:
+                pass
+
             try:
                 h = win32file.CreateFile(f, win32file.GENERIC_READ,
                         win32file.FILE_SHARE_DELETE, None,
@@ -341,11 +347,6 @@ class WindowsAtomicFolderMove(object):
     def delete_originals(self):
         import win32file
         for path in self.handle_map.iterkeys():
-            try:
-                # Ensure the file is not read-only
-                win32file.SetFileAttributes(path, win32file.FILE_ATTRIBUTE_NORMAL)
-            except:
-                pass
             win32file.DeleteFile(path)
         self.close_handles()