peter/borgmatic
1
0
Fork 0
mirror of https://github.com/borgmatic-collective/borgmatic.git synced 2026-07-22 02:03:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken CI build (#1264).

Browse Source
This commit is contained in:
Dan Helfman
2026-04-04 18:02:30 -07:00
parent 9db2bb2b54
commit 8a60fb6398
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
borgmatic/borg/create.py
+4 -2
View File
@@ -391,7 +391,7 @@ def create_archive(
borg_exit_codes = config.get('borg_exit_codes')
if stream_processes:
return '\n'.join(
output = '\n'.join(
execute_command_with_processes(
create_flags + create_positional_arguments,
stream_processes,
@@ -403,9 +403,10 @@ def create_archive(
borg_exit_codes=borg_exit_codes,
)
)
return output if json else None
if output_log_level is None:
return '\n'.join(
output = '\n'.join(
execute_command_and_capture_output(
create_flags + create_positional_arguments,
working_directory=working_directory,
@@ -414,6 +415,7 @@ def create_archive(
borg_exit_codes=borg_exit_codes,
)
)
return output if json else None
execute_command(
create_flags + create_positional_arguments,
borgmatic/execute.py
+6 -2
View File
@@ -367,7 +367,9 @@ def log_buffer_lines(
)
if (
log_record.levelno is None or log_record.levelno >= output_log_level
log_record.levelno is None
or output_log_level is None
or log_record.levelno >= output_log_level
) and process_metadatas[reader.process].capture:
yield log_record.getMessage()
@@ -449,7 +451,9 @@ def log_remaining_buffer_lines(
)
if (
log_record.levelno is None or log_record.levelno >= output_log_level
log_record.levelno is None
or output_log_level is None
or log_record.levelno >= output_log_level
) and process_metadatas[reader.process].capture:
yield log_record.getMessage()
pyproject.toml
+1 -1
View File
@@ -44,7 +44,7 @@ namespaces = false
[tool.pytest.ini_options]
testpaths = "tests"
addopts = "--cov-report term-missing:skip-covered --cov=borgmatic --no-cov-on-fail --cov-fail-under=100 --ignore=tests/end-to-end --timeout=60"
addopts = "--cov-report term-missing:skip-covered --cov=borgmatic --no-cov-on-fail --cov-fail-under=100 --ignore=tests/end-to-end --timeout=120"
[tool.ruff]
line-length = 100