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

Conflicts:
	Changelog.draft.rst

Changelog.draft.rst

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

offlineimap/folder/UIDMaps.py

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