summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Casagrande <tcasagra@thoughtworks.com>2017-01-30 13:45:58 -0200
committerRuben Pollan <meskio@sindominio.net>2017-01-31 09:44:29 +0100
commit7bcdd78c4951ec0034e09aa477c2f3be802c2511 (patch)
tree8189a02959b8d52be42e3c62a531842332ba2344
parentf1c9b1aaa9fc1019c8b27162f4778dc2120b6ee3 (diff)
Propagate errors to the calling methods
Signed-off-by: Ruben Pollan <meskio@sindominio.net>
-rw-r--r--src/leap/bitmask/mail/incoming/service.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/bitmask/mail/incoming/service.py b/src/leap/bitmask/mail/incoming/service.py
index 9b8bc3f8..3cec66e3 100644
--- a/src/leap/bitmask/mail/incoming/service.py
+++ b/src/leap/bitmask/mail/incoming/service.py
@@ -470,7 +470,6 @@ class IncomingMail(Service):
else:
d = self._maybe_decrypt_inline_encrypted_msg(
msg, encoding, senderAddress)
- d.addErrback(self._errback)
return d
def _add_verified_signature_header(self, decrmsg, fingerprint):
@@ -536,7 +535,7 @@ class IncomingMail(Service):
d = self._keymanager.decrypt(
encdata, self._userid, verify=senderAddress)
d.addCallbacks(build_msg, self._decryption_error, errbackArgs=(msg,))
- d.addCallbacks(verify_signature_after_decrypt_an_email, self._errback)
+ d.addCallback(verify_signature_after_decrypt_an_email)
return d
def _maybe_decrypt_inline_encrypted_msg(self, origmsg, encoding,