From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 06:59:02 +0000 (-0000)
Subject: Replace references to portdbapi.eclassdb with appropriate references for the
X-Git-Tag: v2.1.6.12~108
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc1cca6270eb97e0c53df28e42d1921cce5083ee;p=portage.git

Replace references to portdbapi.eclassdb with appropriate references for the
specific repo. (trunk r13294)

svn path=/main/branches/2.1.6/; revision=13465
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index d025be29a..29f1fe996 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -379,8 +379,8 @@ class portdbapi(dbapi):
 		metadata = dict(i)
 
 		if metadata.get("INHERITED", False):
-			metadata["_eclasses_"] = \
-				self.eclassdb.get_eclass_data(metadata["INHERITED"].split())
+			metadata["_eclasses_"] = self._repo_info[repo_path
+				].eclass_db.get_eclass_data(metadata["INHERITED"].split())
 		else:
 			metadata["_eclasses_"] = {}
 
@@ -418,6 +418,7 @@ class portdbapi(dbapi):
 		if pregen_auxdb is not None:
 			auxdbs.append(pregen_auxdb)
 		auxdbs.append(self.auxdb[repo_path])
+		eclass_db = self._repo_info[repo_path].eclass_db
 
 		doregen = True
 		for auxdb in auxdbs:
@@ -437,7 +438,7 @@ class portdbapi(dbapi):
 					eapi = '0'
 				if not (eapi[:1] == '-' and eapi_is_supported(eapi[1:])) and \
 					emtime == metadata['_mtime_'] and \
-					self.eclassdb.is_eclass_data_valid(metadata['_eclasses_']):
+					eclass_db.is_eclass_data_valid(metadata['_eclasses_']):
 					doregen = False
 
 			if not doregen:
@@ -514,8 +515,8 @@ class portdbapi(dbapi):
 				mycpv, myebuild, mylocation, mydata, emtime)
 
 			if mydata.get("INHERITED", False):
-				mydata["_eclasses_"] = \
-					self.eclassdb.get_eclass_data(mydata["INHERITED"].split())
+				mydata["_eclasses_"] = self._repo_info[mylocation
+					].eclass_db.get_eclass_data(mydata["INHERITED"].split())
 			else:
 				mydata["_eclasses_"] = {}