summaryrefslogtreecommitdiff
path: root/indra/lib/python
diff options
context:
space:
mode:
authorsimon <none@none>2014-02-10 15:42:25 -0800
committersimon <none@none>2014-02-10 15:42:25 -0800
commit4acc2dc2736621952b6ee0e808640dcf79e341c6 (patch)
tree9decb3ccc69bfee8fcaeb583bf0c6f6afd7b1243 /indra/lib/python
parent1be85e1a0a2a2d607c74acb684412b6c3b307e6f (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
Merge viewer-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):