diff options
| author | Kali Kaneko <kali@leap.se> | 2015-01-08 14:34:13 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-01-08 14:34:13 -0400 |
| commit | fdbfe431c52b2bc5a88a2328fe79de3035201099 (patch) | |
| tree | 60d6af48f468f0dcd1922998e663f2273a55c41e /src/leap/bitmask/util/privilege_policies.py | |
| parent | 77b576b58f7f533ff4f6a31594bb53d4ffad9d49 (diff) | |
| parent | 54521d35d239c2e62d42e9c77690b9d1bc94f7db (diff) | |
Merge branch 'release/0.8.x' into debian/experimental
Diffstat (limited to 'src/leap/bitmask/util/privilege_policies.py')
| -rw-r--r-- | src/leap/bitmask/util/privilege_policies.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/leap/bitmask/util/privilege_policies.py b/src/leap/bitmask/util/privilege_policies.py index 68a1af28..65132133 100644 --- a/src/leap/bitmask/util/privilege_policies.py +++ b/src/leap/bitmask/util/privilege_policies.py @@ -149,7 +149,12 @@ class LinuxPolicyChecker(PolicyChecker): """ env = None if flags.STANDALONE: - env = {"PYTHONPATH": os.path.abspath('../../../../lib/')} + # This allows us to send to subprocess the environment configs that + # works for the standalone bundle (like the PYTHONPATH) + env = dict(os.environ) + # The LD_LIBRARY_PATH is set on the launcher but not forwarded to + # subprocess unless we do so explicitly. + env["LD_LIBRARY_PATH"] = os.path.abspath("./lib/") try: # We need to quote the command because subprocess call # will do "sh -c 'foo'", so if we do not quoute it we'll end |