/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2009-05-28 16:04:39 UTC
  • mfrom: (4387 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4405.
  • Revision ID: jelmer@samba.org-20090528160439-4z0xlrk5nejobm7q
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
118
118
 
119
119
        auth = config.AuthenticationConfig()
120
120
        if user is None:
121
 
            user = auth.get_user('ftp', self._host, port=self._port)
122
 
            if user is None:
123
 
                # Default to local user
124
 
                user = getpass.getuser()
125
 
 
 
121
            user = auth.get_user('ftp', self._host, port=self._port,
 
122
                                 default=getpass.getuser())
126
123
        mutter("Constructing FTP instance against %r" %
127
124
               ((self._host, self._port, user, '********',
128
125
                self.is_active),))