← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Dmitry Vasiliev
  • Date: 2008-02-08 18:36:35 UTC
  • mto: This revision was merged to the branch mainline in revision 3232.
  • Revision ID: dima@hlabs.spb.ru-20080208183635-srbdry1dncrwmyh0
Re-enabled auto-detection of plink vendor and fixed tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
132
132
 
133
133
    def _get_vendor_by_inspection(self):
134
134
        """Return the vendor or None by checking for known SSH implementations."""
135
 
        # detection of plink vendor is disabled because of bug #107593
136
 
        # https://bugs.launchpad.net/bzr/+bug/107593
137
 
        # who want plink should explicitly enable it with BZR_SSH environment
138
 
        # variable.
139
 
        #~for args in (['ssh', '-V'], ['plink', '-V']):
140
 
        for args in (['ssh', '-V'],):
 
135
        for args in (['ssh', '-V'], ['plink', '-V']):
141
136
            version = self._get_ssh_version_string(args)
142
137
            vendor = self._get_vendor_by_version_string(version, args)
143
138
            if vendor is not None: