diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
| commit | 95f859dc22724611f4a1d2dc91e0c1769ec1e632 (patch) | |
| tree | 3083719871df0fa6627b7a30514bfef3ad5de816 /indra/lib | |
| parent | c5fff11a76613b366216bcd262dfddfd0cc2a6a3 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/lib')
| -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): |