← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
573
573
        return True
574
574
    except paramiko.PasswordRequiredException:
575
575
        password = ui.ui_factory.get_password(
576
 
            prompt='SSH %(filename)s password', filename=filename)
 
576
            prompt=u'SSH %(filename)s password',
 
577
            filename=filename.decode(osutils._fs_enc))
577
578
        try:
578
579
            key = pkey_class.from_private_key_file(filename, password)
579
580
            paramiko_transport.auth_publickey(username, key)