diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
| commit | 2e948a8dc678d3bb5f1d4f34a04efac79b952187 (patch) | |
| tree | 601637c76d2118a803ee79f91339453e1bc5f676 /indra/lib/python | |
| parent | bd800bc2efbba57b66c4a776ac399b3680d184b5 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Pull merge from lindenlab/viewer-release
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): |