Rev 2999: Disable detection of plink.exe as possible ssh vendor. (#107593) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2999
revision-id: pqm at pqm.ubuntu.com-20071115215612-4ovlulhfxh6dhq61
parent: pqm at pqm.ubuntu.com-20071115144759-zx0nd44rgp38riwr
parent: bialix at ukr.net-20071115210753-are3gliqt6ssx6vk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-11-15 21:56:12 +0000
message:
  Disable detection of plink.exe as possible ssh vendor. (#107593)
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
    ------------------------------------------------------------
    revno: 2989.2.3
    merged: bialix at ukr.net-20071115210753-are3gliqt6ssx6vk
    parent: bialix at ukr.net-20071115203956-rk1pyelb2h93c5dy
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: disable.plink
    timestamp: Thu 2007-11-15 23:07:53 +0200
    message:
      fix test_get_vendor_by_inspection_plink
    ------------------------------------------------------------
    revno: 2989.2.2
    merged: bialix at ukr.net-20071115203956-rk1pyelb2h93c5dy
    parent: bialix at ukr.net-20071114121809-33nlq1un6zeqsqu3
    parent: pqm at pqm.ubuntu.com-20071115144759-zx0nd44rgp38riwr
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: disable.plink
    timestamp: Thu 2007-11-15 22:39:56 +0200
    message:
      merge bzr.dev
    ------------------------------------------------------------
    revno: 2989.2.1
    merged: bialix at ukr.net-20071114121809-33nlq1un6zeqsqu3
    parent: pqm at pqm.ubuntu.com-20071114033042-jhkjkkog2k7aoaod
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: disable.plink
    timestamp: Wed 2007-11-14 14:18:09 +0200
    message:
      Disable detection of plink.exe as possible ssh vendor.
      
      Plink vendor still available if user selects it explicitly with BZR_SSH environment
      variable. (Alexander Belchenko, workaround for bug #107593)
=== modified file 'NEWS'
--- a/NEWS	2007-11-14 23:32:59 +0000
+++ b/NEWS	2007-11-15 20:39:56 +0000
@@ -11,6 +11,10 @@
 
   CHANGES:
 
+   * Disable detection of plink.exe as possible ssh vendor. Plink vendor
+     still available if user selects it explicitly with BZR_SSH environment
+     variable. (Alexander Belchenko, workaround for bug #107593)
+
   FEATURES:
 
    * New ``authentication.conf`` file holding the password or other credentials

=== modified file 'bzrlib/tests/test_ssh_transport.py'
--- a/bzrlib/tests/test_ssh_transport.py	2007-03-02 14:10:15 +0000
+++ b/bzrlib/tests/test_ssh_transport.py	2007-11-15 21:07:53 +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)
+        # because autodetection of plink vendor is temporary disabled
+        # next test is no longer pass. so it's disabled as well.
+        #~self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
+        # expect error instead (bialix 20071115)
+        self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
 
     def test_cached_vendor(self):
         manager = TestSSHVendorManager()

=== modified file 'bzrlib/transport/ssh.py'
--- a/bzrlib/transport/ssh.py	2007-10-23 07:25:41 +0000
+++ b/bzrlib/transport/ssh.py	2007-11-15 21:07:53 +0000
@@ -132,7 +132,12 @@
 
     def _get_vendor_by_inspection(self):
         """Return the vendor or None by checking for known SSH implementations."""
-        for args in [['ssh', '-V'], ['plink', '-V']]:
+        # detection of plink vendor is disabled because of bug #107593
+        # https://bugs.launchpad.net/bzr/+bug/107593
+        # who want plink should explicitly enable it with BZR_SSH environment
+        # variable.
+        #~for args in (['ssh', '-V'], ['plink', '-V']):
+        for args in (['ssh', '-V'],):
             version = self._get_ssh_version_string(args)
             vendor = self._get_vendor_by_version_string(version, args)
             if vendor is not None: