summaryrefslogtreecommitdiff
path: root/indra/lib/python
diff options
context:
space:
mode:
authorobscurestar <none@none>2014-02-24 15:12:04 -0800
committerobscurestar <none@none>2014-02-24 15:12:04 -0800
commit8fd270af1cb7ee2cad7c47909b308ef31caf4cd3 (patch)
tree0908629d1ae5173098bb204ab2447c6d351d894e /indra/lib/python
parent57d7cbb8375ca59bcb3d3643e4013b88e8883822 (diff)
parentde8fea13627cc5978b8a6135802a52864a11c39a (diff)
Pulled from release.
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):