← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp/__init__.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/transport/ftp/__init__.py
129
129
 
130
130
        auth = config.AuthenticationConfig()
131
131
        if user is None:
132
 
            user = auth.get_user('ftp', self._host, port=self._port)
133
 
 
 
132
            user = auth.get_user('ftp', self._host, port=self._port,
 
133
                                 default=getpass.getuser())
134
134
        mutter("Constructing FTP instance against %r" %
135
135
               ((self._host, self._port, user, '********',
136
136
                self.is_active),))