zeroconf: gethostbyaddr may also fail with socket.herror stable
authorAugie Fackler <durin42@gmail.com>
Fri, 05 Feb 2010 10:16:52 -0600
branchstable
changeset 10317 192083a3e6fe
parent 10315 be324d31b6c5
child 10318 325a6aa95eea
child 10366 d355cebde5e6
zeroconf: gethostbyaddr may also fail with socket.herror
hgext/zeroconf/__init__.py
--- a/hgext/zeroconf/__init__.py	Fri Feb 05 04:33:08 2010 -0600
+++ b/hgext/zeroconf/__init__.py	Fri Feb 05 10:16:52 2010 -0600
@@ -49,7 +49,7 @@
         dumbip = socket.gethostbyaddr(socket.gethostname())[2][0]
         if not dumbip.startswith('127.') and ':' not in dumbip:
             return dumbip
-    except socket.gaierror:
+    except (socket.gaierror, socket.herror):
         dumbip = '127.0.0.1'
 
     # works elsewhere, but actually sends a packet