work around exception type issue in borg.remote

borgbackup · Sep 23, 2024 · c2436fb · c2436fb
1 parent b57aa46
commit c2436fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/borg/archive.py b/src/borg/archive.py
@@ -2105,7 +2105,8 @@ def finish(self):
             self.manifest.chunks_index_id = None  # invalidate all chunks index caches
             try:
                 self.repository.store_delete("cache/chunks")  # delete the now invalid chunks cache
-            except StoreObjectNotFound:
+            except (Repository.ObjectNotFound, StoreObjectNotFound):
+                # TODO: ^ seem like RemoteRepository raises Repository.ONF instead of StoreONF
                 pass
             self.manifest.write()
 

diff --git a/src/borg/cache.py b/src/borg/cache.py
@@ -649,7 +649,8 @@ def build_chunkindex_from_repo(repository, manifest=None):
         logger.debug(f"trying to get cached chunk index (id {bin_to_hex(wanted_ci_id or b'')}) from the repo...")
         try:
             chunks_data = repository.store_load("cache/chunks")
-        except StoreObjectNotFound:
+        except (Repository.ObjectNotFound, StoreObjectNotFound):
+            # TODO: ^ seem like RemoteRepository raises Repository.ONF instead of StoreONF
             logger.debug("cache/chunks not found in the repository.")
         else:
             if xxh64(chunks_data) == manifest.chunks_index_id: