/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: Andrew Bennetts
  • Date: 2009-09-24 05:31:23 UTC
  • mfrom: (4712 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4713.
  • Revision ID: andrew.bennetts@canonical.com-20090924053123-ztws4evq98lfgbr2
Merge bzr.dev; fix test isolation glitch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
25
25
    config,
26
26
    errors,
27
27
    )
28
 
from bzrlib.trace import info, mutter
 
28
from bzrlib.trace import mutter
29
29
from bzrlib.transport.ftp import FtpTransport
30
30
from bzrlib.transport import register_transport_proto, register_transport
31
31
 
81
81
                        if not ((resp.startswith('235 ') and rc == 1) or
82
82
                                (resp.startswith('335 ') and rc == 0)):
83
83
                            raise ftplib.error_reply, resp
84
 
            info("Authenticated as %s" % kerberos.authGSSClientUserName(
 
84
            trace.note("Authenticated as %s" % kerberos.authGSSClientUserName(
85
85
                    self.vc))
86
86
 
87
87
            # Monkey patch ftplib