summaryrefslogtreecommitdiff
path: root/indra/lib/python/uuid.py
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-11-21 02:29:23 +0000
committerJosh Bell <josh@lindenlab.com>2007-11-21 02:29:23 +0000
commite5057b4747e6a833dde7feb11814bcf8b82fcffc (patch)
treeed390915302f193c9f17175498beb59ded6fd048 /indra/lib/python/uuid.py
parent78aec043f35b8b07dc0f2ba39baba737dd57555e (diff)
svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
Diffstat (limited to 'indra/lib/python/uuid.py')
-rw-r--r--indra/lib/python/uuid.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/lib/python/uuid.py b/indra/lib/python/uuid.py
index 75d189ff7e..48dac84377 100644
--- a/indra/lib/python/uuid.py
+++ b/indra/lib/python/uuid.py
@@ -277,7 +277,11 @@ def _ifconfig_getnode():
import os
for dir in ['', '/sbin/', '/usr/sbin']:
try:
- pipe = os.popen(os.path.join(dir, 'ifconfig'))
+ path = os.path.join(dir, 'ifconfig')
+ if os.path.exists(path):
+ pipe = os.popen(path)
+ else:
+ continue
except IOError:
continue
for line in pipe: