Also ignore 404 errors during delete for conflicts

pimutils · Mar 15, 2023 · e6a5743 · e6a5743
1 parent 55d6ed9
commit e6a5743
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
@@ -603,7 +603,7 @@ async def update(self, href, item, etag):
                     rv = await self._put(self._normalize_href(href), item, None)
                 except aiohttp.ClientResponseError as delerr:
                     dav_logger.debug(f"delerr.status = {delerr.status}")
-                    if delerr.status == 404:
+                    if delerr.status == 403 || delerr.status == 404:
                         dav_logger("Old event not found, ignoring")
                         rv = None, None
                     else:
@@ -628,7 +628,7 @@ async def upload(self, item: Item):
                     rv = await self._put(href, item, None)
                 except aiohttp.ClientResponseError as delerr:
                     dav_logger.debug(f"delerr.status = {delerr.status}")
-                    if delerr.status == 404:
+                    if delerr.status == 403 || delerr.status == 404:
                         dav_logger.debug("Old event not found, ignoring")
                         rv = None, None
                     else: