Browse Source

use prepared env for borg umount

(cherry picked from commit d6f810560cd036d2e60fe3485e849dba48010a38)
Thomas Waldmann 7 years ago
parent
commit
1ecab600f8
2 changed files with 6 additions and 3 deletions
  1. 3 1
      borg/platform.py
  2. 3 2
      borg/platform_linux.pyx

+ 3 - 1
borg/platform.py

@@ -2,6 +2,7 @@ import errno
 import os
 import subprocess
 import sys
+from .helpers import prepare_subprocess_env
 
 
 # POSIX-only, from borg 1.1 platform.base
@@ -20,7 +21,8 @@ def sync_dir(path):
 
 # most POSIX platforms (but not Linux), see also borg 1.1 platform.base
 def umount(mountpoint):
-    return subprocess.call(['umount', mountpoint])
+    env = prepare_subprocess_env(system=True)
+    return subprocess.call(['umount', mountpoint], env=env)
 
 
 if sys.platform.startswith('linux'):  # pragma: linux only

+ 3 - 2
borg/platform_linux.pyx

@@ -2,7 +2,7 @@ import os
 import re
 import subprocess
 from stat import S_ISLNK
-from .helpers import posix_acl_use_stored_uid_gid, user2uid, group2gid, safe_decode, safe_encode
+from .helpers import posix_acl_use_stored_uid_gid, user2uid, group2gid, safe_decode, safe_encode, prepare_subprocess_env
 
 API_VERSION = '1.0_01'
 
@@ -145,4 +145,5 @@ def acl_set(path, item, numeric_owner=False):
 
 
 def umount(mountpoint):
-    return subprocess.call(['fusermount', '-u', mountpoint])
+    env = prepare_subprocess_env(system=True)
+    return subprocess.call(['fusermount', '-u', mountpoint], env=env)