Merge commit 'origin' into v7

[offlineimap] / offlineimap / repository / LocalStatus.py

diff --git a/offlineimap/repository/LocalStatus.py b/offlineimap/repository/LocalStatus.py
index 12de16cd99ab86a2882ab50aee64928963881c54..92e392d13cc5d8d4082be9393279f851bf5a7ed1 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)
-        file = open(filename + ".tmp", "wb")
+        file = open(filename + ".tmp", "wt")
         file.write(offlineimap.folder.LocalStatus.magicline + '\n')
+        file.flush()
+        os.fsync(file.fileno())
         file.close()
-        try:
-            os.unlink(filename)
-        except:
-            pass
         os.rename(filename + ".tmp", filename)
         
         # Invalidate the cache.
@@ -56,12 +54,14 @@ class LocalStatusRepository(BaseRepository):
         retval = []
         for folder in os.listdir(self.directory):
             retval.append(folder.LocalStatus.LocalStatusFolder(self.directory,
-                                                               folder, self, self.accountname))
+                                                               folder, self, self.accountname, 
+                                                               self.config))
         return retval
 
     def getfolder(self, foldername):
         return folder.LocalStatus.LocalStatusFolder(self.directory, foldername,
-                                                    self, self.accountname)
+                                                    self, self.accountname,
+                                                    self.config)