Merge commit 'origin' into v7

[offlineimap] / offlineimap / repository / LocalStatus.py

diff --git a/offlineimap/repository/LocalStatus.py b/offlineimap/repository/LocalStatus.py
index b3b17b1b32de869e1705eb89a2224de956912c67..92e392d13cc5d8d4082be9393279f851bf5a7ed1 100644 (file)
--- a/offlineimap/repository/LocalStatus.py
+++ b/offlineimap/repository/LocalStatus.py
@@ -19,7 +19,7 @@
 from Base import BaseRepository
 from offlineimap import folder
 import offlineimap.folder.LocalStatus
-import os, re, os.path
+import os, re
 
 class LocalStatusRepository(BaseRepository):
     def __init__(self, reposname, account):
@@ -38,12 +38,8 @@ class LocalStatusRepository(BaseRepository):
         return os.path.join(self.directory, foldername)
 
     def makefolder(self, foldername):
-        # Create parent dirs
-        
-        filename = self.getfolderfilename(foldername)
-        os.makedirs(os.path.dirname(foldername), 0700)
-
         # "touch" the file, truncating it.
+        filename = self.getfolderfilename(foldername)
         file = open(filename + ".tmp", "wt")
         file.write(offlineimap.folder.LocalStatus.magicline + '\n')
         file.flush()
@@ -58,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)