Unify LocalStatus.py repository code with folder code

refs #63

diff --git a/offlineimap/repository/LocalStatus.py b/offlineimap/repository/LocalStatus.py
index 12de16cd99ab86a2882ab50aee64928963881c54..8b7ac51d9f733ad00b941d658a417ae960bc1743 100644 (file)
--- a/offlineimap/repository/LocalStatus.py
+++ b/offlineimap/repository/LocalStatus.py
@@ -40,13 +40,11 @@ class LocalStatusRepository(BaseRepository):
     def makefolder(self, foldername):
         # "touch" the file, truncating it.
         filename = self.getfolderfilename(foldername)
     def makefolder(self, foldername):
         # "touch" the file, truncating it.
         filename = self.getfolderfilename(foldername)

-        file = open(filename + ".tmp", "wb")
+        file = open(filename + ".tmp", "wt")

         file.write(offlineimap.folder.LocalStatus.magicline + '\n')
         file.write(offlineimap.folder.LocalStatus.magicline + '\n')

+        file.flush()
+        os.fsync(file.fileno())

         file.close()
         file.close()

-        try:
-            os.unlink(filename)
-        except:
-            pass

         os.rename(filename + ".tmp", filename)
         
         # Invalidate the cache.
         os.rename(filename + ".tmp", filename)
         
         # Invalidate the cache.