Merge lp:~spiv/ubuntu/lucid/paramiko/address-families-579530-lucid into lp:ubuntu/lucid/paramiko

[Andrew Bennetts]

Fix bug 579530, which is affecting bzr.

[Robert Collins (lifeless)]

So, this looks ok to me. Its in main, which means I can't apply it. paramiko has simple-patchsys included, but the patch should be applied precisely by upstream, so I don't really care either way about how the change is recorded. Viva le VCS.

review: Approve

Unmerged revisions

13. By Andrew Bennetts on 2010-05-14

Apply proposed fix for LP: #579530.

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-16 08:15:36 +0000
+++ debian/changelog	2010-05-14 07:52:29 +0000
@@ -1,3 +1,10 @@
+paramiko (1.7.6-2ubuntu1) lucid; urgency=low
+
+  * Try connecting to each available address family until one succeeds.
+    (LP: #579530)
+
+ -- Andrew Bennetts <[e-mail]>  Fri, 14 May 2010 09:41:51 +0200
+
 paramiko (1.7.6-2) unstable; urgency=low
 
   * debian/control: Fix last remaining lintian warning

=== modified file 'paramiko/transport.py'
--- paramiko/transport.py	2009-12-16 08:15:36 +0000
+++ paramiko/transport.py	2010-05-14 07:52:29 +0000
@@ -285,15 +285,21 @@
         if type(sock) is tuple:
             # connect to the given (host, port)
             hostname, port = sock
+            reason = 'No suitable address family'
             for (family, socktype, proto, canonname, sockaddr) in socket.getaddrinfo(hostname, port, socket.AF_UNSPEC, socket.SOCK_STREAM):
                 if socktype == socket.SOCK_STREAM:
                     af = family
                     addr = sockaddr
-                    break
+                    sock = socket.socket(af, socket.SOCK_STREAM)
+                    try:
+                        sock.connect((hostname, port))
+                    except socket.error, e:
+                        reason = str(e)
+                    else:
+                        break
             else:
-                raise SSHException('No suitable address family for %s' % hostname)
-            sock = socket.socket(af, socket.SOCK_STREAM)
-            sock.connect((hostname, port))
+                raise SSHException(
+                    'Unable to connect to %s: %s' % (hostname, reason))
         # okay, normal socket-ish flow here...
         threading.Thread.__init__(self)
         self.setDaemon(True)