diff options
author | Kali Kaneko <kali@leap.se> | 2016-05-18 12:13:52 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2016-05-18 12:13:52 -0400 |
commit | 90aa7a275c41af130dcddaefd798ae35c505b6d5 (patch) | |
tree | 95441aa18d1022eea56d9348e0c32f392bb674ea /src/leap/bitmask/services/soledad/soledadbootstrapper.py | |
parent | aecb13feed8797acaa3f91be45a82a52b64d4723 (diff) | |
parent | facefed990195bd89bf1064e75b171edd084f632 (diff) |
Merge tag '0.9.2'
Tag leap.bitmask version 0.9.2
Diffstat (limited to 'src/leap/bitmask/services/soledad/soledadbootstrapper.py')
-rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 60a2130b..21cdee31 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -331,6 +331,9 @@ class SoledadBootstrapper(AbstractBootstrapper): :returns: the server url :rtype: unicode """ + if not self._soledad_config: + self._soledad_config = SoledadConfig() + # TODO: Select server based on timezone (issue #3308) server_dict = self._soledad_config.get_hosts() @@ -654,7 +657,7 @@ class Syncer(object): logger.error('Invalid auth token while trying to sync Soledad') self._signaler.signal( self._signaler.soledad_invalid_auth_token) - self._callback_deferred.fail(failure) + self._callback_deferred.errback(failure) elif failure.check(sqlite_ProgrammingError, sqlcipher_ProgrammingError): logger.exception("%r" % (failure.value,)) |