diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-10-29 13:03:53 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-10-29 13:03:53 -0300 |
commit | dba45ace351caa4c097f1ee1498e164cf4683a4f (patch) | |
tree | 7269328783217abe12cd9e730fa4e564a13c5521 /src/leap/bitmask/services/eip/linuxvpnlauncher.py | |
parent | 49db36a361a6fe027f2fffacf52d715b11cbdb52 (diff) | |
parent | c90be9157d5423d055984b354c5712f6873336b8 (diff) |
Merge remote-tracking branch 'ivan/bug/4189_fix-non-ascii-path-problem' into develop
Diffstat (limited to 'src/leap/bitmask/services/eip/linuxvpnlauncher.py')
-rw-r--r-- | src/leap/bitmask/services/eip/linuxvpnlauncher.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py index efb23285..d02f6f96 100644 --- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py +++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py @@ -21,6 +21,7 @@ import commands import logging import os import subprocess +import sys import time from leap.bitmask.config import flags @@ -231,6 +232,8 @@ class LinuxVPNLauncher(VPNLauncher): :rtype: dict """ + ld_library_path = os.path.join(get_path_prefix(), "..", "lib") + ld_library_path.encode(sys.getfilesystemencoding()) return { - "LD_LIBRARY_PATH": os.path.join(get_path_prefix(), "..", "lib") + "LD_LIBRARY_PATH": ld_library_path } |