summaryrefslogtreecommitdiff
path: root/src/leap/services/mail/smtpbootstrapper.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-07 14:59:39 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-07 14:59:39 -0300
commitf40e0317949b5ecc471da0fcde42ae269c2664fa (patch)
tree803cc8d7a491906caefbdcdc5e0f08e020bc403b /src/leap/services/mail/smtpbootstrapper.py
parent275109e17f53c2fceb21d6f87626762800f53e22 (diff)
parent52d33ab34cfdb9464b25101843dba3b221aa3b45 (diff)
Merge remote-tracking branch 'ivan/feature/3403_add-support-for-multiple-schema' into develop
Diffstat (limited to 'src/leap/services/mail/smtpbootstrapper.py')
-rw-r--r--src/leap/services/mail/smtpbootstrapper.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/services/mail/smtpbootstrapper.py
index e8af5349..48040035 100644
--- a/src/leap/services/mail/smtpbootstrapper.py
+++ b/src/leap/services/mail/smtpbootstrapper.py
@@ -72,10 +72,12 @@ class SMTPBootstrapper(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/smtp-service.json" % (
- self._provider_config.get_api_uri(),
- self._provider_config.get_api_version())
+ self._provider_config.get_api_uri(), api_version)
+
logger.debug('Downloading SMTP config from: %s' % config_uri)
srp_auth = SRPAuth(self._provider_config)
@@ -91,6 +93,8 @@ class SMTPBootstrapper(AbstractBootstrapper):
cookies=cookies)
res.raise_for_status()
+ self._smtp_config.set_api_version(api_version)
+
# Not modified
if res.status_code == 304:
logger.debug("SMTP definition has not been modified")