~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-29 07:14:39 UTC
  • mfrom: (4310.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090429071439-f7089qmxwc51k9rx
(vila) Respect ~/.ssh/config usernames for bzr+ssh connections
        (#367726)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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),))