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