diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-04-07 01:07:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-07 01:07:52 +0000 |
| commit | 21b7ca34a578c223e481817b6567332a5043153c (patch) | |
| tree | 2ddd1e3dfc6990679611f1e8037b5bba48e95400 | |
| parent | 1785c1129564064b26b07ecbf26047d86a962d80 (diff) | |
| download | portage-21b7ca34a578c223e481817b6567332a5043153c.tar.gz portage-21b7ca34a578c223e481817b6567332a5043153c.tar.bz2 portage-21b7ca34a578c223e481817b6567332a5043153c.zip | |
Replace references to portdbapi.eclassdb with appropriate references for the
specific repo.
svn path=/main/trunk/; revision=13294
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 11 |
1 files changed, 6 insertions, 5 deletions
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_"] = {} |