summaryrefslogtreecommitdiff
path: root/indra/lib/python
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2014-03-06 09:20:54 -0500
committerJonathan Yap <none@none>2014-03-06 09:20:54 -0500
commita0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (patch)
tree9da9b08465582432d12797951543a30d6c9fc2c1 /indra/lib/python
parent672cc7049777b57a01a61428864ac6e3d10df321 (diff)
parenta5e56067c28298b4df0ef498303f78f67c35782c (diff)
STORM-68 merge
Diffstat (limited to 'indra/lib/python')
-rwxr-xr-xindra/lib/python/indra/base/lluuid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lib/python/indra/base/lluuid.py b/indra/lib/python/indra/base/lluuid.py
index 369ae4e92f..7413ffe10d 100755
--- 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):