diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-20 19:11:05 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-20 19:11:05 -0300 |
| commit | bdc638e6fc3dadaaf9c60a19f4e850c5450cfc3e (patch) | |
| tree | cecaecfa596fd9818d80a3b65a32ecb330cf68dd /src/leap/bitmask/services/soledad | |
| parent | c0572dd9e06cd2775348d910433e43b42e05cbb7 (diff) | |
| parent | 8ba650488ea1f1a50b4c22758f647c9f2ee7839d (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/feature/mail-debug' into develop
Diffstat (limited to 'src/leap/bitmask/services/soledad')
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index a92c24a0..3ab62b2e 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -302,6 +302,10 @@ class SoledadBootstrapper(AbstractBootstrapper): except SSLError as exc: logger.error("%r" % (exc,)) raise SoledadSyncError("Failed to sync soledad") + except u1db_errors.InvalidGeneration as exc: + logger.error("%r" % (exc,)) + raise SoledadSyncError("u1db: InvalidGeneration") + except Exception as exc: logger.exception("Unhandled error while syncing " "soledad: %r" % (exc,)) |