diff options
| author | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
|---|---|---|
| committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
| commit | 328f64b4b9b870661a6d0bb8947dc1ff410ca0f8 (patch) | |
| tree | 769bd24c2300307846e316e230db5dadb641611a /indra/lib | |
| parent | 061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc (diff) | |
| parent | 1ad94b5a9a8d0b6d095938148cbf8b1b56a778bf (diff) | |
Merge
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): |