sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only warn on duplicate hrefs in DAV

Browse source 
Fix #88
This commit is contained in:
Markus Unterwaditzer 2014-07-06 20:58:47 +02:00
parent 97a428f3c8
commit 29ba12cf19
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
vdirsyncer/storage/dav.py
View file

@ -543,7 +543,13 @@ class CaldavStorage(DavStorage):
for caldavfilter in caldavfilters: for caldavfilter in caldavfilters:
xml = data.format(caldavfilter=caldavfilter) xml = data.format(caldavfilter=caldavfilter)
for href, etag in self._dav_query(xml): for href, etag in self._dav_query(xml):
assert href not in hrefs if href in hrefs:
# Can't do stronger assertion here, see
# https://github.com/untitaker/vdirsyncer/issues/88
dav_logger.warning('Skipping identical href: {}'
.format(href))
continue
hrefs.add(href) hrefs.add(href)
yield href, etag yield href, etag
@ -611,6 +617,11 @@ class CarddavStorage(DavStorage):
href = self._normalize_href(element.find('{DAV:}href').text) href = self._normalize_href(element.find('{DAV:}href').text)
etag = prop.find('{DAV:}getetag').text etag = prop.find('{DAV:}getetag').text
if href not in hrefs: if href in hrefs:
# Can't do stronger assertion here, see
# https://github.com/untitaker/vdirsyncer/issues/88
dav_logger.warning('Skipping identical href: {}'.format(href))
continue
hrefs.add(href) hrefs.add(href)
yield self._normalize_href(href), etag yield self._normalize_href(href), etag