Merge branch 'outlook_fixes'

This commit is contained in:
Markus Unterwaditzer 2014-09-20 14:06:42 +02:00
commit fcf0f003aa

View file

@ -335,8 +335,12 @@ class DavStorage(Storage):
try: try:
hrefs_left.remove(href) hrefs_left.remove(href)
except KeyError: except KeyError:
raise KeyError('{} doesn\'t exist in {}' if href in hrefs:
.format(href, hrefs_left)) dav_logger.warning('Server sent item twice: {}'
.format(href))
else:
dav_logger.warning('Server sent unsolicited item: {}'
.format(href))
for href in hrefs_left: for href in hrefs_left:
raise exceptions.NotFoundError(href) raise exceptions.NotFoundError(href)
return rv return rv