mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

use prepared env for xattr module's fakeroot version check 

(cherry picked from commit a57e23fdb3)
This commit is contained in:
Thomas Waldmann 2017-09-23 23:27:14 +02:00
parent d7a5ca2e6a
commit 37a5442bef
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/xattr.py
View File

@ -10,7 +10,7 @@ from ctypes import CDLL, create_string_buffer, c_ssize_t, c_size_t, c_char_p, c_
from ctypes.util import find_library from ctypes.util import find_library
from distutils.version import LooseVersion from distutils.version import LooseVersion
from .helpers import Buffer from .helpers import Buffer, prepare_subprocess_env
try: try:
@ -88,7 +88,9 @@ if sys.platform.startswith('linux'):
preloads = re.split("[ :]", LD_PRELOAD) preloads = re.split("[ :]", LD_PRELOAD)
for preload in preloads: for preload in preloads:
if preload.startswith("libfakeroot"): if preload.startswith("libfakeroot"):
fakeroot_version = LooseVersion(subprocess.check_output(['fakeroot', '-v']).decode('ascii').split()[-1]) env = prepare_subprocess_env(system=True)
fakeroot_output = subprocess.check_output(['fakeroot', '-v'], env=env)
fakeroot_version = LooseVersion(fakeroot_output.decode('ascii').split()[-1])
if fakeroot_version >= LooseVersion("1.20.2"): if fakeroot_version >= LooseVersion("1.20.2"):
# 1.20.2 has been confirmed to have xattr support # 1.20.2 has been confirmed to have xattr support
# 1.18.2 has been confirmed not to have xattr support # 1.18.2 has been confirmed not to have xattr support