[gentoo-commits] portage r11729 - in main/trunk/pym/portage: . dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-10-28 03:41:32 +0000 (Tue, 28 Oct 2008)
New Revision: 11729

Modified:
   main/trunk/pym/portage/dbapi/vartree.py
   main/trunk/pym/portage/util.py
Log:
Pass $ROOT into portage.util.getlibpaths().


Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py	2008-10-27 22:35:43 UTC (rev 11728)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-10-28 03:41:32 UTC (rev 11729)
@@ -146,7 +146,7 @@
 		self._dbapi = vardbapi
 		self._libs = {}
 		self._obj_properties = {}
-		self._defpath = set(getlibpaths())
+		self._defpath = set(getlibpaths(self._dbapi.root))
 		self._obj_key_cache = {}
 
 	class _ObjectKey(object):

Modified: main/trunk/pym/portage/util.py
===================================================================
--- main/trunk/pym/portage/util.py	2008-10-27 22:35:43 UTC (rev 11728)
+++ main/trunk/pym/portage/util.py	2008-10-28 03:41:32 UTC (rev 11729)
@@ -1212,16 +1212,17 @@
 				return old_pfile
 	return new_pfile
 
-def getlibpaths():
+def getlibpaths(root):
 	""" Return a list of paths that are used for library lookups """
 
 	# the following is based on the information from ld.so(8)
 	rval = os.environ.get("LD_LIBRARY_PATH", "").split(":")
-	rval.extend(grabfile("/etc/ld.so.conf"))
+	rval.extend(grabfile(os.path.join(root, "etc", "ld.so.conf")))
 	rval.append("/usr/lib")
 	rval.append("/lib")
 
-	rval = [normalize_path(x) for x in rval if x != ""]
-	
+	rval = [normalize_path(os.path.join(root, x.lstrip(os.path.sep))) \
+		for x in rval if x]
+
 	return rval