summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-27 09:59:57 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-27 12:23:09 -0300
commitb1429c296ee852d941a0c88e976631d03140ddee (patch)
tree2a213dd57aab2f9aeabe8881b2c3bc22d6888e1a /src
parent6b4954c88e8106de355eb6a5889fc487dd816173 (diff)
Fix minor bugs and return defer in the run_* methods
Diffstat (limited to 'src')
-rw-r--r--src/leap/services/eip/providerbootstrapper.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/services/eip/providerbootstrapper.py
index e099eee7..754d0643 100644
--- a/src/leap/services/eip/providerbootstrapper.py
+++ b/src/leap/services/eip/providerbootstrapper.py
@@ -155,7 +155,7 @@ class ProviderBootstrapper(AbstractBootstrapper):
if SupportedAPIs.supports(api_version):
logger.debug("Provider definition has been modified")
else:
- api_supported = ', '.join(self._supported_api_versions)
+ api_supported = ', '.join(SupportedAPIs.SUPPORTED_APIS)
error = ('Unsupported provider API version. '
'Supported versions are: {}. '
'Found: {}.').format(api_supported, api_version)
@@ -185,7 +185,7 @@ class ProviderBootstrapper(AbstractBootstrapper):
(self._download_provider_info, self.download_provider_info)
]
- self.addCallbackChain(cb_chain)
+ return self.addCallbackChain(cb_chain)
def _should_proceed_cert(self):
"""
@@ -217,6 +217,7 @@ class ProviderBootstrapper(AbstractBootstrapper):
check_and_fix_urw_only(
self._provider_config
.get_ca_cert_path(about_to_download=True))
+ return
res = self._session.get(self._provider_config.get_ca_cert_uri(),
verify=not self._bypass_checks)
@@ -307,4 +308,4 @@ class ProviderBootstrapper(AbstractBootstrapper):
(self._check_api_certificate, self.check_api_certificate)
]
- self.addCallbackChain(cb_chain)
+ return self.addCallbackChain(cb_chain)