Merge branch 'ns/fix-magicline-import' into next

This commit is contained in:
Nicolas Sebrecht 2011-05-31 18:42:08 +02:00
commit a5a4cb214b

View File

@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
from Base import BaseRepository from Base import BaseRepository
from offlineimap.folder.LocalStatus import LocalStatusFolder from offlineimap.folder.LocalStatus import LocalStatusFolder, magicline
from offlineimap.folder.LocalStatusSQLite import LocalStatusSQLiteFolder from offlineimap.folder.LocalStatusSQLite import LocalStatusSQLiteFolder
import os import os
import re import re
@ -67,7 +67,7 @@ class LocalStatusRepository(BaseRepository):
filename = self.getfolderfilename(foldername) filename = self.getfolderfilename(foldername)
file = open(filename + ".tmp", "wt") file = open(filename + ".tmp", "wt")
file.write(offlineimap.folder.LocalStatus.magicline + '\n') file.write(magicline + '\n')
file.close() file.close()
os.rename(filename + ".tmp", filename) os.rename(filename + ".tmp", filename)
# Invalidate the cache. # Invalidate the cache.