[MERGE] Support for Putty SSH implementation

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dmitry Vasiliev пишет:
> Alexander Belchenko wrote:
>> C:\work\Bazaar\sandbox\bzr.dev>bzr push
>> sftp://bialix@aaronbentley.com/~/repo/bzr.dev/
>> Unable to open connection:
>> Host does not existbzr: ERROR: Unable to connect to SSH host
>> aaronbentley.com; EOF during negotiation
>>
>> While with ususal bzr.dev and paramiko it push OK.
> 
> Ugh, good catch! Actually I've only checked 'bzr+ssh' urls because I
> haven't installed paramiko yet. It seems the fix should be as easy as:
> 
> --- bzrlib/transport/ssh.py     2007-01-05 15:44:16 +0000
> +++ bzrlib/transport/ssh.py     2007-01-08 20:01:20 +0000
> @@ -411,7 +411,7 @@
>          if username is not None:
>              args.extend(['-l', username])
>          if subsystem is not None:
> -            args.extend(['-s', subsystem, host])
> +            args.extend(['-s', host, subsystem])
>          else:
>              args.extend([host] + command)
>          return args
> 
> My code was based on SSHCorpSubprocessVendor and unfortunately there are
> different semantics for '-s' option. I'll update the patch and add tests
> for this case along with the fixes proposed by Andrew.

No, this change does not helps. I have the same error anyway.

- --
Alexander

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFoxr3zYr338mxwCURAu/IAJ0d6Bh7Seb870raujf2LAmrZ5G1QwCffN2N
OYyKNrdOtPN0nGZN18nDxoc=
=ML+4
-----END PGP SIGNATURE-----