summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-09-29 19:58:28 +0200
committerKali Kaneko <kali@leap.se>2017-09-29 19:58:28 +0200
commit09cbaa0f6a02d9ae769df394939dc5cc6a771548 (patch)
tree3581eebcd0473bb5f04627ae7400db50c62a8952
parent0becdd6e8f55324957c50f4d9248dc71c9c41a51 (diff)
[bug] look also from bitmask-root in the debian path
-rw-r--r--src/leap/bitmask/vpn/helpers/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/bitmask/vpn/helpers/__init__.py b/src/leap/bitmask/vpn/helpers/__init__.py
index de7ba06..51feb7a 100644
--- a/src/leap/bitmask/vpn/helpers/__init__.py
+++ b/src/leap/bitmask/vpn/helpers/__init__.py
@@ -12,6 +12,7 @@ from leap.bitmask.util import STANDALONE
if IS_LINUX:
helper_to = '/usr/local/sbin/bitmask-root'
+ deb_helper_to = '/usr/sbin/bitmask-root'
polkit_to = '/usr/share/polkit-1/actions/se.leap.bitmask-bundle.policy'
deb_polkit_to = '/usr/share/polkit-1/actions/se.leap.bitmask.policy'
openvpn_to = '/usr/local/sbin/leap-openvpn'
@@ -39,7 +40,8 @@ if IS_LINUX:
remove(polkit_to)
def check():
- helper = os.path.exists(helper_to)
+ helper = os.path.exists(helper_to) or os.path.isfile(
+ deb_helper_to)
polkit = (
os.path.exists(polkit_to) or
os.path.exists(deb_polkit_to))