Skip to content

Commit e6a5743

Browse files
committed
Also ignore 404 errors during delete for conflicts
1 parent 55d6ed9 commit e6a5743

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

vdirsyncer/storage/dav.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ async def update(self, href, item, etag):
603603
rv = await self._put(self._normalize_href(href), item, None)
604604
except aiohttp.ClientResponseError as delerr:
605605
dav_logger.debug(f"delerr.status = {delerr.status}")
606-
if delerr.status == 404:
606+
if delerr.status == 403 || delerr.status == 404:
607607
dav_logger("Old event not found, ignoring")
608608
rv = None, None
609609
else:
@@ -628,7 +628,7 @@ async def upload(self, item: Item):
628628
rv = await self._put(href, item, None)
629629
except aiohttp.ClientResponseError as delerr:
630630
dav_logger.debug(f"delerr.status = {delerr.status}")
631-
if delerr.status == 404:
631+
if delerr.status == 403 || delerr.status == 404:
632632
dav_logger.debug("Old event not found, ignoring")
633633
rv = None, None
634634
else:

0 commit comments

Comments
 (0)