diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-08-08 12:19:45 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-08-08 12:19:45 -0300 |
commit | 2bb9737ef4b17b363e95bd5221cbba34751c75bd (patch) | |
tree | 9ff6319a6acd8dddc6f112f037fb848e31afae9d /src/leap/services/soledad/soledadbootstrapper.py | |
parent | 17affdf90bb8d4f866128bacfb68e13877d4a2b7 (diff) | |
parent | 3d07947ebca6b9dc339fc040cc4498ee94b9a42c (diff) |
Merge remote-tracking branch 'ivan/feature/3404_multiple-schema-support-for-soledad' into develop
Diffstat (limited to 'src/leap/services/soledad/soledadbootstrapper.py')
-rw-r--r-- | src/leap/services/soledad/soledadbootstrapper.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py index d53aeadb..7ac4203b 100644 --- a/src/leap/services/soledad/soledadbootstrapper.py +++ b/src/leap/services/soledad/soledadbootstrapper.py @@ -143,10 +143,12 @@ class SoledadBootstrapper(AbstractBootstrapper): if self._download_if_needed and mtime: headers['if-modified-since'] = mtime + api_version = self._provider_config.get_api_version() + # there is some confusion with this uri, config_uri = "%s/%s/config/soledad-service.json" % ( self._provider_config.get_api_uri(), - self._provider_config.get_api_version()) + api_version) logger.debug('Downloading soledad config from: %s' % config_uri) srp_auth = SRPAuth(self._provider_config) @@ -162,6 +164,8 @@ class SoledadBootstrapper(AbstractBootstrapper): cookies=cookies) res.raise_for_status() + self._soledad_config.set_api_version(api_version) + # Not modified if res.status_code == 304: logger.debug("Soledad definition has not been modified") |