diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
| commit | 5d573b4f10109811b1ec7d277dfb15c548f00530 (patch) | |
| tree | 3de86f0c027a29f7dfb2dac94e3d7f9251f1018b /src/leap/bitmask/platform_init/initializers.py | |
| parent | 5111539437aa98660e72a19e2468b3e3fac44942 (diff) | |
| parent | 584866689560bd2ebea01ecc5e6ae5e79ce7fc81 (diff) | |
Merge tag '0.3.4' into debian
Tag leap.bitmask version 0.3.4
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'src/leap/bitmask/platform_init/initializers.py')
| -rw-r--r-- | src/leap/bitmask/platform_init/initializers.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py index 831c6a1c..d93efbc6 100644 --- a/src/leap/bitmask/platform_init/initializers.py +++ b/src/leap/bitmask/platform_init/initializers.py @@ -29,7 +29,9 @@ import tempfile from PySide import QtGui from leap.bitmask.config.leapsettings import LeapSettings -from leap.bitmask.services.eip import vpnlaunchers +from leap.bitmask.services.eip import get_vpn_launcher +from leap.bitmask.services.eip.linuxvpnlauncher import LinuxVPNLauncher +from leap.bitmask.services.eip.darwinvpnlauncher import DarwinVPNLauncher from leap.bitmask.util import first from leap.bitmask.util import privilege_policies @@ -106,7 +108,7 @@ def check_missing(): config = LeapSettings() alert_missing = config.get_alert_missing_scripts() - launcher = vpnlaunchers.get_platform_launcher() + launcher = get_vpn_launcher() missing_scripts = launcher.missing_updown_scripts missing_other = launcher.missing_other_files @@ -251,7 +253,7 @@ def _darwin_install_missing_scripts(badexec, notfound): "..", "Resources", "openvpn") - launcher = vpnlaunchers.DarwinVPNLauncher + launcher = DarwinVPNLauncher if os.path.isdir(installer_path): fd, tempscript = tempfile.mkstemp(prefix="leap_installer-") @@ -356,7 +358,7 @@ def _linux_install_missing_scripts(badexec, notfound): """ success = False installer_path = os.path.join(os.getcwd(), "apps", "eip", "files") - launcher = vpnlaunchers.LinuxVPNLauncher + launcher = LinuxVPNLauncher # XXX refactor with darwin, same block. |