Merge branch 'main' into spot-check.

borgmatic/borg/list.py

@@ -79,9 +79,11 @@ def make_find_paths(find_paths):
         return ()
 
     return tuple(
+        (
             find_path
             if re.compile(r'([-!+RrPp] )|(\w\w:)').match(find_path)
             else f'sh:**/*{find_path}*/**'
+        )
         for find_path in find_paths
     )
 

borgmatic/execute.py

@@ -376,9 +376,9 @@ def execute_command_with_processes(
             command,
             stdin=input_file,
             stdout=None if do_not_capture else (output_file or subprocess.PIPE),
-            stderr=None
+            stderr=(
-            if do_not_capture
+                None if do_not_capture else (subprocess.PIPE if output_file else subprocess.STDOUT)
-            else (subprocess.PIPE if output_file else subprocess.STDOUT),
+            ),
             shell=shell,
             env=environment,
             cwd=working_directory,

borgmatic/hooks/command.py

@@ -68,9 +68,9 @@ def execute_hook(commands, umask, config_filename, description, dry_run, **conte
             if not dry_run:
                 execute.execute_command(
                     [command],
-                    output_log_level=logging.ERROR
+                    output_log_level=(
-                    if description == 'on-error'
+                        logging.ERROR if description == 'on-error' else logging.WARNING
-                    else logging.WARNING,
+                    ),
                     shell=True,
                 )
     finally:

test_requirements.txt

@@ -1,7 +1,7 @@
 appdirs==1.4.4
 apprise==1.3.0
 attrs==22.2.0
-black==23.3.0
+black==24.3.0
 certifi==2023.7.22
 chardet==5.1.0
 click==8.1.3