diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-20 13:27:07 -0300 | 
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-20 13:27:07 -0300 | 
| commit | c8227124c3c78f56ad8c6c1ed212140f7248a225 (patch) | |
| tree | 20ae4497d22b88fde3719eb5b43076f3f52c2513 | |
| parent | c5847f8991fb93d34f6364163ecae15c8376ab2b (diff) | |
| parent | 044825286cc79c863b0e0be79a6fcf8fde0ef891 (diff) | |
Merge branch 'release-0.3.3'
| -rw-r--r-- | mail/CHANGELOG | 3 | ||||
| -rw-r--r-- | mail/setup.py | 6 | ||||
| -rw-r--r-- | mail/src/leap/mail/imap/fetch.py | 1 | 
3 files changed, 6 insertions, 4 deletions
| diff --git a/mail/CHANGELOG b/mail/CHANGELOG index 40446be0..fb62efd3 100644 --- a/mail/CHANGELOG +++ b/mail/CHANGELOG @@ -1,3 +1,6 @@ +0.3.3 Sep 20: +  o Remove cleartext mail from logs. Closes: #3877. +  0.3.2 Sep 6:    o Make mail services bind to 127.0.0.1. Closes: #3627.    o Signal unread message to UI when message is saved locally. Closes: #3654. diff --git a/mail/setup.py b/mail/setup.py index f4a663fa..f423f7b7 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -15,7 +15,7 @@  # You should have received a copy of the GNU General Public License  # along with this program.  If not, see <http://www.gnu.org/licenses/>.  """ -setup file for leap.mail +Setup file for leap.mail  """  from setuptools import setup  from setuptools import find_packages @@ -56,9 +56,9 @@ setup(      license='GPLv3+',      author='The LEAP Encryption Access Project',      author_email='info@leap.se', -    description='Mail Services in the LEAP Client project.', +    description='Mail Services provided by Bitmask, the LEAP Client.',      long_description=( -        "Mail Services in the LEAP Client project." +        "Mail Services provided by Bitmask, the LEAP Client."      ),      classifiers=trove_classifiers,      namespace_packages=["leap"], diff --git a/mail/src/leap/mail/imap/fetch.py b/mail/src/leap/mail/imap/fetch.py index e620a584..4fb39100 100644 --- a/mail/src/leap/mail/imap/fetch.py +++ b/mail/src/leap/mail/imap/fetch.py @@ -280,7 +280,6 @@ class LeapIncomingMail(object):          rawmsg = msg.get(self.CONTENT_KEY, None)          if not rawmsg:              return False -        logger.debug('got incoming message: %s' % (rawmsg,))          data = self._maybe_decrypt_gpg_msg(rawmsg)          return doc, data | 
