diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-02-11 15:37:51 -0800 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-02-11 15:37:51 -0800 |
| commit | 6580df1ed745b8d5b782fb4bfb9bf7b86660b103 (patch) | |
| tree | 314d81e8b63d4e109e6494e92996a26e1f5910e2 /indra/lib/python | |
| parent | c894c53449ee7ed096e3ecdcf5c1f32cecb392ba (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
viewer-release merge
Diffstat (limited to 'indra/lib/python')
| -rwxr-xr-x | indra/lib/python/indra/base/lluuid.py | 2 |
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): |