← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smtp_connection.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-29 06:45:12 UTC
  • mfrom: (4304.2.1 367726-ssh-default-user)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090429064512-5wa7iv1vdjmoit64
https://launchpad.net/bugs/367726
Respect ~/.ssh/config usernames for bzr+ssh connections

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: