Skip to content

Commit 966d711

Browse files
committed
Also ignore 404 errors during delete for conflicts
1 parent 3e5e438 commit 966d711

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

vdirsyncer/storage/dav.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@ async def update(self, href, item, etag):
604604
rv = await self._put(self._normalize_href(href), item, None)
605605
except aiohttp.ClientResponseError as delerr:
606606
dav_logger.debug(f"delerr.status = {delerr.status}")
607-
if delerr.status == 404:
608-
dav_logger("Old event not found, ignoring")
607+
if delerr.status == 403 or delerr.status == 404:
608+
dav_logger.warning("Old event not found, ignoring")
609609
rv = None, None
610610
else:
611611
raise
@@ -629,8 +629,8 @@ async def upload(self, item: Item):
629629
rv = await self._put(href, item, None)
630630
except aiohttp.ClientResponseError as delerr:
631631
dav_logger.debug(f"delerr.status = {delerr.status}")
632-
if delerr.status == 404:
633-
dav_logger.debug("Old event not found, ignoring")
632+
if delerr.status == 403 or delerr.status == 404:
633+
dav_logger.warning("Old event not found, ignoring")
634634
rv = None, None
635635
else:
636636
raise

0 commit comments

Comments
 (0)