← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Alexander Belchenko
  • Date: 2009-08-22 05:01:55 UTC
  • mto: (4634.5.1 2.0-integration)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: bialix@ukr.net-20090822050155-uq8a9vo7ltmk68lo
Disabled auto-detection of plink SSH client to avoid many problems. On Windows paramiko wil be used as default. Nevertheless user can force usage of plink via env variable BZR_SSH=plink

See https://bugs.launchpad.net/bugs/414743

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
123
123
        elif 'SSH Secure Shell' in version:
124
124
            trace.mutter('ssh implementation is SSH Corp.')
125
125
            vendor = SSHCorpSubprocessVendor()
126
 
        elif 'plink' in version and args[0] == 'plink':
127
 
            # Checking if "plink" was the executed argument as Windows
128
 
            # sometimes reports 'ssh -V' incorrectly with 'plink' in it's
129
 
            # version.  See https://bugs.launchpad.net/bzr/+bug/107155
130
 
            trace.mutter("ssh implementation is Putty's plink.")
131
 
            vendor = PLinkSubprocessVendor()
 
126
        # Auto-detect of plink vendor disabled, on Windows recommended
 
127
        # default ssh-client is paramiko
 
128
        # see https://bugs.launchpad.net/bugs/414743
 
129
        #~elif 'plink' in version and args[0] == 'plink':
 
130
        #~    # Checking if "plink" was the executed argument as Windows
 
131
        #~    # sometimes reports 'ssh -V' incorrectly with 'plink' in it's
 
132
        #~    # version.  See https://bugs.launchpad.net/bzr/+bug/107155
 
133
        #~    trace.mutter("ssh implementation is Putty's plink.")
 
134
        #~    vendor = PLinkSubprocessVendor()
132
135
        return vendor
133
136
 
134
137
    def _get_vendor_by_inspection(self):