From dcbbda4dbd442340cbc46e2f1a476cb21e12ca0f Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Tue, 27 Mar 2018 13:27:07 +0200 Subject: [refactor] move platform constants into leap.bitmask The IS_${platform} constants are used in more places than the vpn module. Let's define them in leap.bitmask. --- src/leap/bitmask/vpn/launchers/linux.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/leap/bitmask/vpn/launchers/linux.py') diff --git a/src/leap/bitmask/vpn/launchers/linux.py b/src/leap/bitmask/vpn/launchers/linux.py index 5e05bea4..748fe858 100644 --- a/src/leap/bitmask/vpn/launchers/linux.py +++ b/src/leap/bitmask/vpn/launchers/linux.py @@ -28,6 +28,7 @@ from twisted.internet import defer, reactor from twisted.internet.endpoints import clientFromString, connectProtocol from twisted.logger import Logger +from leap.bitmask.system import IS_SNAP from leap.bitmask.vpn.utils import first, force_eval from leap.bitmask.vpn import constants from leap.bitmask.vpn import _config @@ -35,8 +36,6 @@ from leap.bitmask.vpn.privilege import LinuxPolicyChecker from leap.bitmask.vpn.management import ManagementProtocol from leap.bitmask.vpn.launcher import VPNLauncher -IS_SNAP = os.environ.get('SNAP') - TERMINATE_MAXTRIES = 10 TERMINATE_WAIT = 1 # secs RESTART_WAIT = 2 # secs -- cgit v1.2.3