/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: 2012-01-30 14:12:36 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120130141236-66k8qj1he6q2nq3r
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

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