← Back to branch summary

~abentley/bzr/revert

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2009-04-29 20:45:01 UTC
  • mfrom: (1918.1.14 export)
  • mto: This revision was merged to the branch mainline in revision 1939.
  • Revision ID: aaron@aaronbentley.com-20090429204501-gcahaoovugwdrmmy
Merge export into mv

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),))