summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/leap/bitmask/vpn/helpers/__init__.py9
-rw-r--r--src/leap/bitmask/vpn/privilege.py3
2 files changed, 8 insertions, 4 deletions
diff --git a/src/leap/bitmask/vpn/helpers/__init__.py b/src/leap/bitmask/vpn/helpers/__init__.py
index 9641e035..54b29cb0 100644
--- a/src/leap/bitmask/vpn/helpers/__init__.py
+++ b/src/leap/bitmask/vpn/helpers/__init__.py
@@ -20,7 +20,8 @@ if IS_LINUX:
from leap.bitmask.vpn.constants import BITMASK_ROOT_SYSTEM
from leap.bitmask.vpn.constants import BITMASK_ROOT_LOCAL
- from leap.bitmask.vpn.constants import OPENVPN_SYSTEM, OPENVPN_LOCAL, OPENVPN_SNAP
+ from leap.bitmask.vpn.constants import OPENVPN_SYSTEM, OPENVPN_LOCAL
+ from leap.bitmask.vpn.constants import OPENVPN_SNAP
from leap.bitmask.vpn.constants import POLKIT_SYSTEM, POLKIT_LOCAL
from leap.bitmask.vpn.privilege import is_pkexec_in_system
from leap.bitmask.vpn.privilege import LinuxPolicyChecker
@@ -95,11 +96,13 @@ if IS_LINUX:
helper_path_digest = digest(helper_path)
if (_exists_and_can_read(BITMASK_ROOT_SYSTEM) and
helper_path_digest == digest(BITMASK_ROOT_SYSTEM)):
- log.debug('Global bitmask-root: %s' % os.path.isfile(BITMASK_ROOT_SYSTEM))
+ log.debug('Global bitmask-root: %s'
+ % os.path.isfile(BITMASK_ROOT_SYSTEM))
return True
if (_exists_and_can_read(BITMASK_ROOT_LOCAL) and
helper_path_digest == digest(BITMASK_ROOT_LOCAL)):
- log.debug('Local bitmask-root: %s' % os.path.isfile(BITMASK_ROOT_LOCAL))
+ log.debug('Local bitmask-root: %s'
+ % os.path.isfile(BITMASK_ROOT_LOCAL))
return True
log.debug('No valid bitmask-root found')
diff --git a/src/leap/bitmask/vpn/privilege.py b/src/leap/bitmask/vpn/privilege.py
index 94d6cce5..8a922cfe 100644
--- a/src/leap/bitmask/vpn/privilege.py
+++ b/src/leap/bitmask/vpn/privilege.py
@@ -55,7 +55,8 @@ def _helper_installer(action):
if IS_LINUX:
if IS_SNAP:
- log.debug('Skipping install of helpers, snap should have done that')
+ log.debug('Skipping install of helpers, '
+ 'snap should have done that')
return
cmd = 'bitmask_helpers ' + action
if STANDALONE: