← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
25
25
    errors,
26
26
    )
27
27
from bzrlib.i18n import gettext
28
 
from bzrlib.trace import mutter
 
28
from bzrlib.trace import (
 
29
    mutter,
 
30
    note,
 
31
    )
29
32
from bzrlib.transport.ftp import FtpTransport
30
33
 
31
34
try:
80
83
                        if not ((resp.startswith('235 ') and rc == 1) or
81
84
                                (resp.startswith('335 ') and rc == 0)):
82
85
                            raise ftplib.error_reply, resp
83
 
            trace.note(gettext("Authenticated as %s") %
84
 
                            kerberos.authGSSClientUserName(self.vc))
 
86
            note(gettext("Authenticated as %s") %
 
87
                 kerberos.authGSSClientUserName(self.vc))
85
88
 
86
89
            # Monkey patch ftplib
87
90
            self.putcmd = self.mic_putcmd