diff options
| author | Kali Kaneko <kali@leap.se> | 2014-05-15 08:50:07 -0500 | 
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-05-15 08:54:03 -0500 | 
| commit | 19391a9eb7ac4b09dd86c4d722291dbda140dde0 (patch) | |
| tree | 7f36a70a27b8e1631e1b9c7376ab4bd4be181ee3 | |
| parent | 825ac1fcb8bf5a0ac3ae44442e287d207374ca14 (diff) | |
allow osx and win to continue with updown scripts for the time being
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnlauncher.py | 27 | 
1 files changed, 14 insertions, 13 deletions
diff --git a/src/leap/bitmask/services/eip/vpnlauncher.py b/src/leap/bitmask/services/eip/vpnlauncher.py index 1498632a..dcb48e8a 100644 --- a/src/leap/bitmask/services/eip/vpnlauncher.py +++ b/src/leap/bitmask/services/eip/vpnlauncher.py @@ -25,14 +25,12 @@ import stat  from abc import ABCMeta, abstractmethod  from functools import partial -from leap.bitmask.config import flags  from leap.bitmask.config.leapsettings import LeapSettings  from leap.bitmask.config.providerconfig import ProviderConfig +from leap.bitmask.platform_init import IS_LINUX  from leap.bitmask.services.eip.eipconfig import EIPConfig, VPNGatewaySelector -from leap.bitmask.util import first -from leap.bitmask.util import get_path_prefix  from leap.common.check import leap_assert, leap_assert_type -from leap.common.files import which +  logger = logging.getLogger(__name__) @@ -264,15 +262,18 @@ class VPNLauncher(object):          :rtype: list          """ -        # XXX remove when we ditch UPDOWN in osx and win too -        #leap_assert(kls.UPDOWN_FILES is not None, -                    #"Need to define UPDOWN_FILES for this particular " -                    #"launcher before calling this method") -        #file_exist = partial(_has_updown_scripts, warn=False) -        #zipped = zip(kls.UPDOWN_FILES, map(file_exist, kls.UPDOWN_FILES)) -        #missing = filter(lambda (path, exists): exists is False, zipped) -        #return [path for path, exists in missing] -        return [] +        # FIXME +        # XXX remove method when we ditch UPDOWN in osx and win too +        if IS_LINUX: +            return [] +        else: +            leap_assert(kls.UPDOWN_FILES is not None, +                        "Need to define UPDOWN_FILES for this particular " +                        "launcher before calling this method") +            file_exist = partial(_has_updown_scripts, warn=False) +            zipped = zip(kls.UPDOWN_FILES, map(file_exist, kls.UPDOWN_FILES)) +            missing = filter(lambda (path, exists): exists is False, zipped) +            return [path for path, exists in missing]      @classmethod      def missing_other_files(kls):  | 
