diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-25 21:32:54 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-25 21:32:54 -0400 |
| commit | 434d0534661d7c222e5dabc4e5e237b060d2212b (patch) | |
| tree | 2e7bf0e556f983bd5404481a9aa4fb0fd7d75778 /src/leap/bitmask/services/soledad/soledadbootstrapper.py | |
| parent | 9ee728108f3b894d097206cc6ff6d0a70808f2d5 (diff) | |
| parent | f47416804ad2f88ba27aa032e0d2fc1c9fd314c8 (diff) | |
Merge branch 'develop' into debian/experimental
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,)) |