merge with stable
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 05 Feb 2010 17:24:38 +0100
changeset 10318 325a6aa95eea
parent 10316 d117089386e2 (current diff)
parent 10317 192083a3e6fe (diff)
child 10319 86a6bc519592
child 10320 808c187fc556
merge with stable
--- a/hgext/zeroconf/__init__.py	Fri Feb 05 07:07:53 2010 -0600
+++ b/hgext/zeroconf/__init__.py	Fri Feb 05 17:24:38 2010 +0100
@@ -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