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

use prepared env for borg with-lock

Browse source 
(cherry picked from commit 6da5bf4b85)
This commit is contained in:
Thomas Waldmann 2017-09-23 22:35:10 +02:00
parent 2f7d7bdbb8
commit 3b20c18c3b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/borg/archiver.py
View file

@ -64,7 +64,7 @@
from .helpers import basic_json_data, json_print
from .helpers import replace_placeholders
from .helpers import ChunkIteratorFileWrapper
from .helpers import popen_with_error_handling
from .helpers import popen_with_error_handling, prepare_subprocess_env
from .helpers import dash_open
from .helpers import umount
from .nanorst import rst_to_terminal
@ -1677,9 +1677,10 @@ def do_with_lock(self, args, repository):
# we can only do this for local repositories (with .io), though:
if hasattr(repository, 'io'):
repository.io.close_segment()
env = prepare_subprocess_env(system=True)
try:
# we exit with the return code we get from the subprocess
return subprocess.call([args.command] + args.args)
return subprocess.call([args.command] + args.args, env=env)
finally:
# we need to commit the "no change" operation we did to the manifest
# because it created a new segment file in the repository. if we would