From c3038e129df1855adf6eab4f3554068e6431a5be Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 25 Sep 2024 23:45:27 +0200 Subject: [PATCH 1/2] catch BackendError raised by Store(), see #8373 --- src/borg/repository.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/borg/repository.py b/src/borg/repository.py index c293358b00..d2e6fac694 100644 --- a/src/borg/repository.py +++ b/src/borg/repository.py @@ -3,6 +3,7 @@ from borgstore.store import Store from borgstore.store import ObjectNotFound as StoreObjectNotFound +from borgstore.backends.errors import BackendError as StoreBackendError from borgstore.backends.errors import BackendDoesNotExist as StoreBackendDoesNotExist from .checksums import xxh64 @@ -116,7 +117,10 @@ def __init__( location = Location(url) self._location = location # use a Store with flat config storage and 2-levels-nested data storage - self.store = Store(url, levels={"config/": [0], "data/": [2]}) + try: + self.store = Store(url, levels={"config/": [0], "data/": [2]}) + except StoreBackendError as e: + raise Error(str(e)) self.version = None # long-running repository methods which emit log or progress output are responsible for calling # the ._send_log method periodically to get log and progress output transferred to the borg client From 628990d32c2ac633beeb0b15c2108c1a446fa283 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 25 Sep 2024 23:53:15 +0200 Subject: [PATCH 2/2] fix markup error in change log --- docs/changes.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index d2674a52b9..bfef96728b 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -57,8 +57,8 @@ Compatibility notes: - or, if the command makes sense for an arbitrary amount of archives, archives can be selected using a glob pattern, like: - - borg delete -a 'sh:myarchive-2024-*' - - borg recreate -a 'sh:myarchive-2024-*' + - borg delete -a 'sh:myarchive-2024-??-??' + - borg recreate -a 'sh:myarchive-2024-??-??' - some borg 1.x commands that supported working on a repo AND on an archive were split into 2 commands, some others were renamed: