From d7a5ca2e6a772ae18c5aaaa0fc9fbf8e67b0bbbf Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 23 Sep 2017 22:54:52 +0200 Subject: [PATCH] use prepared env for borg export-tar --tar-filter subprocess (cherry picked from commit cf59f653e5821ddee7af2c4d4fc8806744fab017) --- src/borg/archiver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index df10cef59..d899edca5 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -790,10 +790,12 @@ class Archiver: # 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.