From e5057b4747e6a833dde7feb11814bcf8b82fcffc Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 21 Nov 2007 02:29:23 +0000
Subject: svn merge -r 73201:74169
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server -->
 release

---
 indra/lib/python/uuid.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/lib')

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:
-- 
cgit v1.2.3