Merge branch 'master' into next

Conflicts: Changelog.draft.rst
2011-05-05 21:16:02 +02:00
parent f3774343db f2ad4bc230
commit c6259fbb86
4 changed files with 12 additions and 5 deletions
--- a/offlineimap/folder/LocalStatus.py
+++ b/offlineimap/folder/LocalStatus.py
@ -77,8 +77,13 @@ class LocalStatusFolder(BaseFolder):
        assert(line == magicline)
        for line in file.xreadlines():
            line = line.strip()
-            uid, flags = line.split(':')
-            uid = long(uid)
+            try:
+                uid, flags = line.split(':')
+                uid = long(uid)
+            except ValueError, e:
+                errstr = "Corrupt line '%s' in cache file '%s'" % (line, self.filename)
+                self.ui.warn(errstr)
+                raise ValueError(errstr)
            flags = [x for x in flags]
            self.messagelist[uid] = {'uid': uid, 'flags': flags}
        file.close()