From: phil <phil>
Date: Tue, 1 Mar 2005 21:24:56 +0000 (+0000)
Subject: b=5800
X-Git-Tag: v1_8_0_110~486^7~160
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c3a5b7db9d40fc31194fef75409e328d1c46c9a5;p=fs%2Flustre-release.git

b=5800
Info:
	HP SFS 2250/CFS 5800

	On em64t/x86_64 systems the %{_libdir} rpm path resolves to
	/usr/lib64 rather than /usr/lib. This patch updates lconf to
	look in both locations for the Lustre extension modules.
---

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index c07c60e..b818deb 100755
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -35,7 +35,7 @@ if sys.version[0] == '1':
 else:
     from fcntl import F_GETFL, F_SETFL
 
-PYMOD_DIR = "/usr/lib/lustre/python"
+PYMOD_DIR = ["/usr/lib/lustre/python", "/usr/lib64/lustre/python"]
 
 def development_mode():
     base = os.path.dirname(sys.argv[0])
@@ -46,7 +46,7 @@ def development_mode():
 if development_mode():
     sys.path.append('../utils')
 else:
-    sys.path.append(PYMOD_DIR)
+    sys.path.extend(PYMOD_DIR)
 
 import Lustre