tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ss/corrupted-uidmap-file' into next

Browse Source 
Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht 2011-05-02 19:09:52 +02:00
commit e9a7afda6d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.draft.rst
View File

@ -21,6 +21,7 @@ Changes
slight speedup. slight speedup.
* No whitespace is stripped from comma-separated arguments passed via * No whitespace is stripped from comma-separated arguments passed via
the -f option. the -f option.
* Give more detailed error when encountering a corrupt UID mapping file.
Bug Fixes Bug Fixes
--------- ---------

6
offlineimap/folder/UIDMaps.py
View File

@ -51,7 +51,11 @@ class MappingFolderMixIn:
line = file.readline() line = file.readline()
if not len(line): if not len(line):
break break
line = line.strip() try:
line = line.strip()
except ValueError:
raise Exception("Corrupt line '%s' in UID mapping file '%s'" \
%(line, mapfilename))
(str1, str2) = line.split(':') (str1, str2) = line.split(':')
loc = long(str1) loc = long(str1)
rem = long(str2) rem = long(str2)