diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2016-02-02 18:10:26 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-02-28 14:49:00 -0400 |
| commit | 5b1bea0c8813206a7f17119c1c82eafc8e727bbb (patch) | |
| tree | 032b825940db6446af4aa9c597fcd2458db8673b /mail | |
| parent | 9e15deaee705fcc5f01f10c63c695595e937d3b1 (diff) | |
[bug] Use the right succeed function for passthrough encrypted email
- Resolves #7861
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/changes/next-changelog.rst | 3 | ||||
| -rw-r--r-- | mail/src/leap/mail/outgoing/service.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mail/changes/next-changelog.rst b/mail/changes/next-changelog.rst index 79792460..67bf9402 100644 --- a/mail/changes/next-changelog.rst +++ b/mail/changes/next-changelog.rst @@ -20,9 +20,10 @@ Features Bugfixes ~~~~~~~~ -- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235. +- `#7861 <https://leap.se/code/issues/7861>`_: Use the right succeed function for passthrough encrypted email. - Fix the get_body logic for corner-cases in which body is None (yet-to-be synced docs, mainly). +- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235. - Bugfix without related issue number. Misc diff --git a/mail/src/leap/mail/outgoing/service.py b/mail/src/leap/mail/outgoing/service.py index 8d7c0f8f..8e06bd40 100644 --- a/mail/src/leap/mail/outgoing/service.py +++ b/mail/src/leap/mail/outgoing/service.py @@ -254,7 +254,7 @@ class OutgoingMail(object): origmsg = Parser().parsestr(raw) if origmsg.get_content_type() == 'multipart/encrypted': - return defer.success((origmsg, recipient)) + return defer.succeed((origmsg, recipient)) from_address = validate_address(self._from_address) username, domain = from_address.split('@') |