| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-07 01:07:52 +0000 (Tue, 07 Apr 2009) |
| 3 |
New Revision: 13294 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/porttree.py |
| 7 |
Log: |
| 8 |
Replace references to portdbapi.eclassdb with appropriate references for the |
| 9 |
specific repo. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/porttree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/porttree.py 2009-04-07 00:57:35 UTC (rev 13293) |
| 15 |
+++ main/trunk/pym/portage/dbapi/porttree.py 2009-04-07 01:07:52 UTC (rev 13294) |
| 16 |
@@ -379,8 +379,8 @@ |
| 17 |
metadata = dict(i) |
| 18 |
|
| 19 |
if metadata.get("INHERITED", False): |
| 20 |
- metadata["_eclasses_"] = \ |
| 21 |
- self.eclassdb.get_eclass_data(metadata["INHERITED"].split()) |
| 22 |
+ metadata["_eclasses_"] = self._repo_info[repo_path |
| 23 |
+ ].eclass_db.get_eclass_data(metadata["INHERITED"].split()) |
| 24 |
else: |
| 25 |
metadata["_eclasses_"] = {} |
| 26 |
|
| 27 |
@@ -418,6 +418,7 @@ |
| 28 |
if pregen_auxdb is not None: |
| 29 |
auxdbs.append(pregen_auxdb) |
| 30 |
auxdbs.append(self.auxdb[repo_path]) |
| 31 |
+ eclass_db = self._repo_info[repo_path].eclass_db |
| 32 |
|
| 33 |
doregen = True |
| 34 |
for auxdb in auxdbs: |
| 35 |
@@ -437,7 +438,7 @@ |
| 36 |
eapi = '0' |
| 37 |
if not (eapi[:1] == '-' and eapi_is_supported(eapi[1:])) and \ |
| 38 |
emtime == metadata['_mtime_'] and \ |
| 39 |
- self.eclassdb.is_eclass_data_valid(metadata['_eclasses_']): |
| 40 |
+ eclass_db.is_eclass_data_valid(metadata['_eclasses_']): |
| 41 |
doregen = False |
| 42 |
|
| 43 |
if not doregen: |
| 44 |
@@ -514,8 +515,8 @@ |
| 45 |
mycpv, myebuild, mylocation, mydata, emtime) |
| 46 |
|
| 47 |
if mydata.get("INHERITED", False): |
| 48 |
- mydata["_eclasses_"] = \ |
| 49 |
- self.eclassdb.get_eclass_data(mydata["INHERITED"].split()) |
| 50 |
+ mydata["_eclasses_"] = self._repo_info[mylocation |
| 51 |
+ ].eclass_db.get_eclass_data(mydata["INHERITED"].split()) |
| 52 |
else: |
| 53 |
mydata["_eclasses_"] = {} |
Archives