diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:08:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:08:20 -0500 |
| commit | dfbc6c65f665f5c550581b77aeb7c308181fd8d8 (patch) | |
| tree | e31a72c55ad0aa01728b90c861e2b91aa8c6b53b /indra/lib | |
| parent | 831251785762897a72da2b4dc9fb62731491fe4d (diff) | |
| parent | 254728e00d600bdb4b211d9fd4b7da33e3872fea (diff) | |
merge changes for open-203
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): |