diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-23 17:01:33 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-23 17:01:33 -0300 |
| commit | 70f8f9ff06dd4ee52fba4b3bc35ead530242552b (patch) | |
| tree | d21c7708cf22abbc6992ad48f2c149db012eede9 | |
| parent | 159dbe295148975bdfe9a50f871254aa9adf2328 (diff) | |
| parent | aec9c8ff50ed61cd484e3aefe638da6705b53ff8 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/set-standalone-flags-for-baseconfig' into develop
| -rw-r--r-- | changes/bug_set-standalone-flags-for-baseconfig | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/config/providerconfig.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/eipconfig.py | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug_set-standalone-flags-for-baseconfig b/changes/bug_set-standalone-flags-for-baseconfig new file mode 100644 index 00000000..bf84d3e8 --- /dev/null +++ b/changes/bug_set-standalone-flags-for-baseconfig @@ -0,0 +1 @@ +- Set the standalone value for BaseConfig according to the global flags. diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py index 7b979e61..57bc3a98 100644 --- a/src/leap/bitmask/config/providerconfig.py +++ b/src/leap/bitmask/config/providerconfig.py @@ -22,6 +22,7 @@ import logging import os from leap.bitmask import provider +from leap.bitmask.config import flags from leap.bitmask.config.provider_spec import leap_provider_spec from leap.bitmask.services import get_service_display_name from leap.bitmask.util import get_path_prefix @@ -43,6 +44,7 @@ class ProviderConfig(BaseConfig): Provider configuration abstraction class """ def __init__(self): + self.standalone = flags.STANDALONE BaseConfig.__init__(self) def get_light_config(self, domain, lang=None): diff --git a/src/leap/bitmask/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py index e7419b22..37c0c8ae 100644 --- a/src/leap/bitmask/services/eip/eipconfig.py +++ b/src/leap/bitmask/services/eip/eipconfig.py @@ -24,6 +24,7 @@ import time import ipaddr +from leap.bitmask.config import flags from leap.bitmask.config.providerconfig import ProviderConfig from leap.bitmask.services import ServiceConfig from leap.bitmask.services.eip.eipspec import get_schema @@ -220,6 +221,7 @@ class EIPConfig(ServiceConfig): OPENVPN_CIPHERS_REGEX = re.compile("[A-Z0-9\-]+") def __init__(self): + self.standalone = flags.STANDALONE ServiceConfig.__init__(self) self._api_version = None |