Skip to content

Commit

Permalink
Merge pull request #7839 from ThomasWaldmann/traceback-for-tam-except…
Browse files Browse the repository at this point in the history
…ions-1.2

activate tracebacks for TAM exceptions
  • Loading branch information
ThomasWaldmann authored Sep 25, 2023
2 parents 4188e03 + 6dbfbd6 commit c9c495d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/borg/crypto/key.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,19 @@ class TAMRequiredError(IntegrityError):
In the latter case, use "borg upgrade --tam --force '{}'" to re-authenticate the manifest.
""").strip()
traceback = False
traceback = True


class ArchiveTAMRequiredError(TAMRequiredError):
__doc__ = textwrap.dedent("""
Archive '{}' is unauthenticated, but it is required for this repository.
""").strip()
traceback = False
traceback = True


class TAMInvalid(IntegrityError):
__doc__ = IntegrityError.__doc__
traceback = False
traceback = True

def __init__(self):
# Error message becomes: "Data integrity error: Manifest authentication did not verify"
Expand All @@ -107,7 +107,7 @@ def __init__(self):

class ArchiveTAMInvalid(IntegrityError):
__doc__ = IntegrityError.__doc__
traceback = False
traceback = True

def __init__(self):
# Error message becomes: "Data integrity error: Archive authentication did not verify"
Expand All @@ -116,7 +116,7 @@ def __init__(self):

class TAMUnsupportedSuiteError(IntegrityError):
"""Could not verify manifest: Unsupported suite {!r}; a newer version is needed."""
traceback = False
traceback = True


class KeyBlobStorage:
Expand Down

0 comments on commit c9c495d

Please sign in to comment.