From 8a60fb63986e003bbfd9de317e436fa47804314b Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Sat, 4 Apr 2026 18:02:30 -0700
Subject: [PATCH] Fix broken CI build (#1264).

---
 borgmatic/borg/create.py | 6 ++++--
 borgmatic/execute.py     | 8 ++++++--
 pyproject.toml           | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/borgmatic/borg/create.py b/borgmatic/borg/create.py
index c20ea439..7d23e9d7 100644
--- a/borgmatic/borg/create.py
+++ b/borgmatic/borg/create.py
@@ -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,
diff --git a/borgmatic/execute.py b/borgmatic/execute.py
index a06c0cd3..e1c5844a 100644
--- a/borgmatic/execute.py
+++ b/borgmatic/execute.py
@@ -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()
 
diff --git a/pyproject.toml b/pyproject.toml
index 8808633c..1ecb7a7d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -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