Rev 5261: Merge sftp-leaks into catch-them-all in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5261 [merge]
revision-id: v.ladeuil+lp at free.fr-20100605170613-rw94320vew1d2wdx
parent: v.ladeuil+lp at free.fr-20100605163107-6mjhnbwoz6nzpr1w
parent: v.ladeuil+lp at free.fr-20100605170612-6j2ijld4wqr23gbg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: catch-them-all
timestamp: Sat 2010-06-05 19:06:13 +0200
message:
  Merge sftp-leaks into catch-them-all
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2010-06-02 13:01:24 +0000
+++ b/bzrlib/osutils.py	2010-06-05 17:06:04 +0000
@@ -2038,7 +2038,7 @@
     # We don't use nor handle the timeout though
     def connect_socket(address, timeout=None):
         err = socket.error('getaddrinfo returns an empty list')
-        for res in socket.getaddrinfo(host, port):
+        for res in socket.getaddrinfo(*address):
             af, socktype, proto, canonname, sa = res
             sock = None
             try: