borgmatic-collective/borgmatic
borgmatic-collective/borgmatic
9
65
Fork 31
Code Issues 45 Pull Requests 4 Actions Packages Releases 147 Activity

More fix for a potential traceback (TypeError) during the handling of another error.
All checks were successful
build / test (push) Successful in 5m55s
Details
build / docs (push) Successful in 1m33s
Details

Browse Source
This commit is contained in:
Dan Helfman 2024-07-15 14:45:21 -07:00
parent d44dc93509
commit 27e7ece2f5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
borgmatic/commands/borgmatic.py
View File

@ -614,13 +614,13 @@ def log_error_records(
level_name = logging._levelToName[levelno]
if not error:
yield log_record(levelno=levelno, levelname=level_name, msg=message)
yield log_record(levelno=levelno, levelname=level_name, msg=str(message))
return
try:
raise error
except CalledProcessError as error:
yield log_record(levelno=levelno, levelname=level_name, msg=message)
yield log_record(levelno=levelno, levelname=level_name, msg=str(message))
if error.output:
try:
@ -639,10 +639,10 @@ def log_error_records(
suppress_log=True,
)
yield log_record(levelno=levelno, levelname=level_name, msg=error)
yield log_record(levelno=levelno, levelname=level_name, msg=str(error))
except (ValueError, OSError) as error:
yield log_record(levelno=levelno, levelname=level_name, msg=message)
yield log_record(levelno=levelno, levelname=level_name, msg=error)
yield log_record(levelno=levelno, levelname=level_name, msg=str(message))
yield log_record(levelno=levelno, levelname=level_name, msg=str(error))
except: # noqa: E722
# Raising above only as a means of determining the error type. Swallow the exception here
# because we don't want the exception to propagate out of this function.