mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-09 21:57:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7915 from ThomasWaldmann/fix-subcommand-env-1.2

Browse source 
create --*-from-command: run subcommands with a clean environment
This commit is contained in:
TW 2023-11-07 03:42:25 +01:00 • committed by GitHub
commit 4e349cf3fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/archiver.py
View file

@ -533,7 +533,8 @@ class Archiver:
if not dry_run: if not dry_run:
try: try:
try: try:
proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE, preexec_fn=ignore_sigint) env = prepare_subprocess_env(system=True)
proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE, env=env, preexec_fn=ignore_sigint)
except (FileNotFoundError, PermissionError) as e: except (FileNotFoundError, PermissionError) as e:
self.print_error('Failed to execute command: %s', e) self.print_error('Failed to execute command: %s', e)
return self.exit_code return self.exit_code
@ -552,7 +553,8 @@ class Archiver:
paths_sep = eval_escapes(args.paths_delimiter) if args.paths_delimiter is not None else '\n' paths_sep = eval_escapes(args.paths_delimiter) if args.paths_delimiter is not None else '\n'
if args.paths_from_command: if args.paths_from_command:
try: try:
proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE, preexec_fn=ignore_sigint) env = prepare_subprocess_env(system=True)
proc = subprocess.Popen(args.paths, stdout=subprocess.PIPE, env=env, preexec_fn=ignore_sigint)
except (FileNotFoundError, PermissionError) as e: except (FileNotFoundError, PermissionError) as e:
self.print_error('Failed to execute command: %s', e) self.print_error('Failed to execute command: %s', e)
return self.exit_code return self.exit_code