merge changes for open-196

2013-11-21 11:29:28 -05:00 · 2013-11-21 11:29:28 -05:00 · 4f2a7167b6
parent 84a96cdf0f ecb2220afd
commit 4f2a7167b6
1 changed files with 1 additions and 1 deletions
--- a/indra/lib/python/indra/base/lluuid.py
+++ b/indra/lib/python/indra/base/lluuid.py
@ -72,7 +72,7 @@ class UUID(object):
    ip = ''
    try:
        ip = socket.gethostbyname(socket.gethostname())
-    except(socket.gaierror):
+    except(socket.gaierror, socket.error):
        # no ip address, so just default to somewhere in 10.x.x.x
        ip = '10'
        for i in range(3):