Mercurial > hg-stable

changeset 10318:325a6aa95eea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 05 Feb 2010 17:24:38 +0100
parents d117089386e2 (current diff) 192083a3e6fe (diff)
children 86a6bc519592 808c187fc556
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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