diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-21 11:29:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 11:29:28 -0500 |
| commit | 4f2a7167b6d6b3b278b39ea7b97beb89f6abb5ee (patch) | |
| tree | de5a3f31ef8f8309b24cca17147cfe91c4b6e2e6 | |
| parent | 84a96cdf0f4e27089dedd151df55e7916b33abb8 (diff) | |
| parent | ecb2220afd68e1d13c9af476265d008c2d92354b (diff) | |
merge changes for open-196
| -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): |