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

use prepared env for borg export-tar --tar-filter subprocess

Browse source 
(cherry picked from commit cf59f653e5)
This commit is contained in:
Thomas Waldmann 2017-09-23 22:54:52 +02:00
parent d6f810560c
commit d7a5ca2e6a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/borg/archiver.py
View file

@ -790,10 +790,12 @@ def do_export_tar(self, args, repository, manifest, key, archive):
# The decision whether to close that or not remains the same.
filterout = tarstream
filterout_close = tarstream_close
env = prepare_subprocess_env(system=True)
# There is no deadlock potential here (the subprocess docs warn about this), because
# communication with the process is a one-way road, i.e. the process can never block
# for us to do something while we block on the process for something different.
filterproc = popen_with_error_handling(filter, stdin=subprocess.PIPE, stdout=filterout, log_prefix='--tar-filter: ')
filterproc = popen_with_error_handling(filter, stdin=subprocess.PIPE, stdout=filterout,
log_prefix='--tar-filter: ', env=env)
if not filterproc:
return EXIT_ERROR
# Always close the pipe, otherwise the filter process would not notice when we are done.