Rev 5468: (vila) Don't force openssh to use protocol=2 (Neil Martinsen-Burrell) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5468 [merge]
revision-id: pqm at pqm.ubuntu.com-20101007124551-zfqhlkqdegiy7otp
parent: pqm at pqm.ubuntu.com-20101007121024-j35of7ub8jaxrkc4
parent: nmb at wartburg.edu-20101005021248-74kzkjrqsmv13sm3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-10-07 13:45:51 +0100
message:
  (vila) Don't force openssh to use protocol=2 (Neil Martinsen-Burrell)
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
=== modified file 'NEWS'
--- a/NEWS	2010-10-07 11:00:48 +0000
+++ b/NEWS	2010-10-07 12:45:51 +0000
@@ -43,6 +43,9 @@
   using this, make sure the process holding the lock really is dead.)
   (Martin Pool, #397315)
 
+* Don't force openssh to use protocol=2, since that is now the default.
+  (Neil Martinsen-Burrell, #561061)
+
 * Print junk rather than throwing a UnicodeDecodeError from ``bzr version-info``
   when using the rio format (with non-ascii information) on a non-utf-8 terminal.
   (Andrej A Antonov, #518609)

=== modified file 'bzrlib/tests/test_ssh_transport.py'
--- a/bzrlib/tests/test_ssh_transport.py	2010-09-28 01:09:30 +0000
+++ b/bzrlib/tests/test_ssh_transport.py	2010-10-07 12:45:51 +0000
@@ -167,7 +167,7 @@
             vendor._get_vendor_specific_argv(
                 "user", "host", 100, command=["bzr"]),
             ["ssh", "-oForwardX11=no", "-oForwardAgent=no",
-                "-oClearAllForwardings=yes", "-oProtocol=2",
+                "-oClearAllForwardings=yes",
                 "-oNoHostAuthenticationForLocalhost=yes",
                 "-p", "100",
                 "-l", "user",
@@ -180,7 +180,7 @@
             vendor._get_vendor_specific_argv(
                 "user", "host", 100, subsystem="sftp"),
             ["ssh", "-oForwardX11=no", "-oForwardAgent=no",
-                "-oClearAllForwardings=yes", "-oProtocol=2",
+                "-oClearAllForwardings=yes",
                 "-oNoHostAuthenticationForLocalhost=yes",
                 "-p", "100",
                 "-l", "user",

=== modified file 'bzrlib/transport/ssh.py'
--- a/bzrlib/transport/ssh.py	2010-10-02 01:48:34 +0000
+++ b/bzrlib/transport/ssh.py	2010-10-07 12:45:51 +0000
@@ -406,7 +406,7 @@
                                   command=None):
         args = [self.executable_path,
                 '-oForwardX11=no', '-oForwardAgent=no',
-                '-oClearAllForwardings=yes', '-oProtocol=2',
+                '-oClearAllForwardings=yes',
                 '-oNoHostAuthenticationForLocalhost=yes']
         if port is not None:
             args.extend(['-p', str(port)])