diff --git a/src/borg/archiver/create.py b/src/borg/archiver/create.py index 499f0f6ea..1925f0a7a 100644 --- a/src/borg/archiver/create.py +++ b/src/borg/archiver/create.py @@ -26,7 +26,7 @@ from ..helpers import dir_is_tagged from ..helpers import log_multi from ..helpers import basic_json_data, json_print from ..helpers import flags_root, flags_dir, flags_special_follow, flags_special -from ..helpers import sig_int +from ..helpers import sig_int, ignore_sigint from ..helpers import iter_separated from ..patterns import PatternMatcher from ..platform import get_flags @@ -68,7 +68,7 @@ class CreateMixIn: if not dry_run: try: try: - proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE) + proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE, preexec_fn=ignore_sigint) except (FileNotFoundError, PermissionError) as e: self.print_error("Failed to execute command: %s", e) return self.exit_code @@ -89,7 +89,7 @@ class CreateMixIn: paths_sep = eval_escapes(args.paths_delimiter) if args.paths_delimiter is not None else "\n" if args.paths_from_command: try: - proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE) + proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE, preexec_fn=ignore_sigint) except (FileNotFoundError, PermissionError) as e: self.print_error("Failed to execute command: %s", e) return self.exit_code diff --git a/src/borg/helpers/__init__.py b/src/borg/helpers/__init__.py index e808bc213..cea471506 100644 --- a/src/borg/helpers/__init__.py +++ b/src/borg/helpers/__init__.py @@ -31,7 +31,8 @@ from .parseformat import Location, location_validator, archivename_validator from .parseformat import BaseFormatter, ArchiveFormatter, ItemFormatter, file_status from .parseformat import swidth_slice, ellipsis_truncate from .parseformat import BorgJsonEncoder, basic_json_data, json_print, json_dump, prepare_dump_dict -from .process import daemonize, daemonizing, signal_handler, raising_signal_handler, sig_int, SigHup, SigTerm +from .process import daemonize, daemonizing +from .process import signal_handler, raising_signal_handler, sig_int, ignore_sigint, SigHup, SigTerm from .process import popen_with_error_handling, is_terminal, prepare_subprocess_env, create_filter_process from .progress import ProgressIndicatorPercent, ProgressIndicatorEndless, ProgressIndicatorMessage from .time import parse_timestamp, timestamp, safe_timestamp, safe_s, safe_ns, MAX_S, SUPPORT_32BIT_PLATFORMS diff --git a/src/borg/helpers/process.py b/src/borg/helpers/process.py index bbd6e8677..3d6de7aef 100644 --- a/src/borg/helpers/process.py +++ b/src/borg/helpers/process.py @@ -336,11 +336,21 @@ def create_filter_process(cmd, stream, stream_close, inbound=True): # for us to do something while we block on the process for something different. if inbound: proc = popen_with_error_handling( - cmd, stdout=subprocess.PIPE, stdin=filter_stream, log_prefix="filter-process: ", env=env + cmd, + stdout=subprocess.PIPE, + stdin=filter_stream, + log_prefix="filter-process: ", + env=env, + preexec_fn=ignore_sigint, ) else: proc = popen_with_error_handling( - cmd, stdin=subprocess.PIPE, stdout=filter_stream, log_prefix="filter-process: ", env=env + cmd, + stdin=subprocess.PIPE, + stdout=filter_stream, + log_prefix="filter-process: ", + env=env, + preexec_fn=ignore_sigint, ) if not proc: raise Error(f"filter {cmd}: process creation failed")