~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mail_client.py

  • Committer: Lukáš Lalinsky
  • Date: 2007-08-12 21:08:27 UTC
  • mto: (2681.1.26 send-bundle)
  • mto: This revision was merged to the branch mainline in revision 2736.
  • Revision ID: lalinsky@gmail.com-20070812210827-sfljgm5tvv6f0k9j
New version of simplemapi.py with MIT license.

Show diffs side-by-side

added added

removed removed

Lines of Context:
166
166
        from bzrlib.util import simplemapi
167
167
        try:
168
168
            simplemapi.SendMail(to or '', subject or '', '', attach_path)
169
 
        except WindowsError:
170
 
            raise errors.MailClientNotFound(['MAPI supported mail client'])
 
169
        except simplemapi.MAPIError, e:
 
170
            if e.code != simplemapi.MAPI_USER_ABORT:
 
171
                raise errors.MailClientNotFound(['MAPI supported mail client'
 
172
                                                 ' (error %d)' % (e.code,)])
171
173
 
172
174
 
173
175
class DefaultMail(MailClient):