[Pkg-bazaar-maint] Bug#444545: Fwd: Bug#444545: bzr: bzr+ssh:// broken with non-standard ports

[John Arbash Meinel]

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

James Westby wrote:
> Hi all,
> 
> Here is a report of a problem using non standard ports with ssh that was
> broken with the fix for bzr://. Roland has isolated the problem well, so
> his message should tell you anything you need.
> 
> I guess this would be a candidate for a 0.91.1 release.
> 
> I will file a bug for this issue now.
> 
> Thanks,
> 
> James
> 

At one point I thought we had a test that using "None" explicitly did
*not* set the default port. Because of this specific reason.

I'm guessing there is a bit of friction, because for bzr:// we need to
set the port, but for ssh we really don't want to.

Now, a few questions...

Why didn't this patch get merged into bzr.dev? At least my bzr.dev at
revno 2872 doesn't have the same transport code as 0.91 at revno 2819.
(It makes it hard to fix bzr.dev when it doesn't have the bug).

This should fix it, but we should really have a way to test it.
=== modified file 'bzrlib/transport/__init__.py'
- --- bzrlib/transport/__init__.py        2007-09-12 02:05:23 +0000
+++ bzrlib/transport/__init__.py        2007-10-01 15:05:31 +0000
@@ -1640,7 +1640,7 @@

 register_transport_proto('sftp://',
             help="Access using SFTP (most SSH servers provide SFTP).",
- -            default_port=22)
+            default_port=None) # Let SSH set the port
 register_lazy_transport('sftp://', 'bzrlib.transport.sftp',
'SFTPTransport')
 # Decorated http transport
 register_transport_proto('http+urllib://',
@@ -1724,7 +1724,7 @@
                         'RemoteHTTPTransport')
 register_transport_proto('bzr+ssh://',
             help="Fast access using the Bazaar smart server over SSH.",
- -            default_port=22)
+            default_port=None)
 register_lazy_transport('bzr+ssh://',
                         'bzrlib.transport.remote',
                         'RemoteSSHTransport')


Maybe just a test for:

self.assertEqual(None,
  bzrlib.transport.transport_list_registry.get_default_port('sftp'))
self.assertEqual(None,
  bzrlib.transport.transport_list_registry.get_default_port('bzr+ssh'))

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHAQ0ZJdeBCYSNAAMRAv99AJ4onJFO+er8NqZDXIO+rPb73He8XgCgkoZa
Cjjq/OJ5cjipwV9U7HlVz6g=
=Fdlg
-----END PGP SIGNATURE-----