← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smtp_connection.py

  • Committer: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smtp_connection.py
109
109
            # FIXME: Since _authenticate gets called even when no authentication
110
110
            # is necessary, it's not possible to use the default username 
111
111
            # here yet.
112
 
            self._smtp_username = auth.get_user('smtp', self._smtp_server, 
113
 
                default="")
114
 
            if self._smtp_username == "":
 
112
            self._smtp_username = auth.get_user('smtp', self._smtp_server)
 
113
            if self._smtp_username is None:
115
114
                return
116
115
 
117
116
        if self._smtp_password is None: