← 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: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

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