diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-02-12 10:59:36 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-02-12 10:59:36 -0300 |
| commit | 75e564c7a98243d3b2ba6bea2478abe69a875855 (patch) | |
| tree | ed7615e3819ac1f859cff78d88d8d68993a86f87 /src/leap/bitmask/services | |
| parent | 73047830a243217406d72b267d106c5c8434b499 (diff) | |
| parent | 29902330067f564185d7b57a864be2099f8ea2e8 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/cancel-login-does-not-work' into develop
Diffstat (limited to 'src/leap/bitmask/services')
| -rw-r--r-- | src/leap/bitmask/services/abstractbootstrapper.py | 7 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/abstractbootstrapper.py b/src/leap/bitmask/services/abstractbootstrapper.py index 3bee8e01..fc6bd3e9 100644 --- a/src/leap/bitmask/services/abstractbootstrapper.py +++ b/src/leap/bitmask/services/abstractbootstrapper.py @@ -28,6 +28,7 @@ from PySide import QtCore from twisted.python import log from twisted.internet import threads +from twisted.internet.defer import CancelledError from leap.common.check import leap_assert, leap_assert_type @@ -91,6 +92,12 @@ class AbstractBootstrapper(QtCore.QObject): :param failure: failure object that Twisted generates :type failure: twisted.python.failure.Failure """ + if failure.check(CancelledError): + logger.debug("Defer cancelled.") + failure.trap(Exception) + self._signaler.signal(self._signaler.PROV_CANCELLED_SETUP) + return + if self._signal_to_emit: err_msg = self._err_msg \ if self._err_msg is not None \ diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 9e797042..b61d0d43 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -624,4 +624,4 @@ class SoledadBootstrapper(AbstractBootstrapper): (self._gen_key, self.gen_key) ] - self.addCallbackChain(cb_chain) + return self.addCallbackChain(cb_chain) |