From 31d56c51a47ad5eecbab5c59217522ba5e739212 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 13 Mar 2013 10:43:40 -0400
Subject: [PATCH] fix / workaround potential for socket.getaddrinfo to raise
 socket.error

As reported in bug 1154599, I'm seeing this on my desktop system:
$ python -c \
  'from cloudinit import util; print util.is_resolvable("brickies.neiit")'
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "cloudinit/util.py", line 865, in is_resolvable
    socket.SOCK_STREAM, socket.AI_CANONNAME)
---
 cloudinit/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloudinit/util.py b/cloudinit/util.py
index a1f6e004..10297ca2 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -867,7 +867,7 @@ def is_resolvable(name):
                 for (_fam, _stype, _proto, cname, sockaddr) in result:
                     badresults[iname].append("%s: %s" % (cname, sockaddr[0]))
                     badips.add(sockaddr[0])
-            except socket.gaierror:
+            except (socket.gaierror, socket.error):
                 pass
         _DNS_REDIRECT_IP = badips
         if badresults:
@@ -880,7 +880,7 @@ def is_resolvable(name):
         if addr in _DNS_REDIRECT_IP:
             return False
         return True
-    except socket.gaierror:
+    except (socket.gaierror, socket.error):
         return False