Rev 4635: Disable plink auto-detection in http://bazaar.launchpad.net/~vila/bzr/2.0-integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.0-integration

------------------------------------------------------------
revno: 4635 [merge]
revision-id: v.ladeuil+lp at free.fr-20090825092233-6nh9oaz7l630t9hv
parent: pqm at pqm.ubuntu.com-20090820135727-pz56lf0l0tj6rbrn
parent: bialix at ukr.net-20090822050542-9cfhqg0yrpd73nv9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.0-integration
timestamp: Tue 2009-08-25 11:22:33 +0200
message:
  Disable plink auto-detection
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
  bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-08-20 12:30:49 +0000
+++ b/NEWS	2009-08-22 05:05:42 +0000
@@ -18,6 +18,11 @@
   into ``rich-root`` repositories from ``2a``. The Upgrade guide
   has more information about this change. (Robert Collins)
 
+* On Windows auto-detection of Putty's plink.exe is disabled.
+  Default SSH client for Windows is paramiko. User still can force
+  usage of plink if explicitly set environment variable BZR_SSH=plink.
+  (#414743, Alexander Belchenko)
+
 New Features
 ************
 

=== modified file 'bzrlib/tests/test_ssh_transport.py'
--- a/bzrlib/tests/test_ssh_transport.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/test_ssh_transport.py	2009-08-22 05:01:55 +0000
@@ -76,7 +76,11 @@
         manager = TestSSHVendorManager()
         self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
         manager.set_ssh_version_string("plink")
-        self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
+        # Auto-detect of plink vendor disabled, on Windows recommended
+        # default ssh-client is paramiko
+        # see https://bugs.launchpad.net/bugs/414743
+        #~self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
+        self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
 
     def test_cached_vendor(self):
         manager = TestSSHVendorManager()

=== modified file 'bzrlib/transport/ssh.py'
--- a/bzrlib/transport/ssh.py	2009-07-20 21:28:29 +0000
+++ b/bzrlib/transport/ssh.py	2009-08-22 05:01:55 +0000
@@ -123,12 +123,15 @@
         elif 'SSH Secure Shell' in version:
             trace.mutter('ssh implementation is SSH Corp.')
             vendor = SSHCorpSubprocessVendor()
-        elif 'plink' in version and args[0] == 'plink':
-            # Checking if "plink" was the executed argument as Windows
-            # sometimes reports 'ssh -V' incorrectly with 'plink' in it's
-            # version.  See https://bugs.launchpad.net/bzr/+bug/107155
-            trace.mutter("ssh implementation is Putty's plink.")
-            vendor = PLinkSubprocessVendor()
+        # Auto-detect of plink vendor disabled, on Windows recommended
+        # default ssh-client is paramiko
+        # see https://bugs.launchpad.net/bugs/414743
+        #~elif 'plink' in version and args[0] == 'plink':
+        #~    # Checking if "plink" was the executed argument as Windows
+        #~    # sometimes reports 'ssh -V' incorrectly with 'plink' in it's
+        #~    # version.  See https://bugs.launchpad.net/bzr/+bug/107155
+        #~    trace.mutter("ssh implementation is Putty's plink.")
+        #~    vendor = PLinkSubprocessVendor()
         return vendor
 
     def _get_vendor_by_inspection(self):