summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-10 19:41:59 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-10 19:41:59 -0700
commit9532d0b0c9801569e3270413ada1f2503a613e13 (patch)
tree8e5ba6f043b4d9d843fd8ac17ece90148c303085
parentde7237f75c498785dfa9c669ea39868edcdf389b (diff)
downloadportage-9532d0b0c9801569e3270413ada1f2503a613e13.tar.gz
portage-9532d0b0c9801569e3270413ada1f2503a613e13.tar.bz2
portage-9532d0b0c9801569e3270413ada1f2503a613e13.zip
Eliminate redundant _eclasses_ code from aux_get which is handled
by _metadata_callback().
-rw-r--r--pym/portage/dbapi/porttree.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index f0d891edf..2cf6989b0 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -649,7 +649,6 @@ class portdbapi(dbapi):
raise KeyError(mycpv)
self.doebuild_settings.setcpv(mycpv)
- mydata = {}
eapi = None
if eapi is None and \
@@ -664,9 +663,8 @@ class portdbapi(dbapi):
self.doebuild_settings.configdict['pkg']['EAPI'] = eapi
if eapi is not None and not portage.eapi_is_supported(eapi):
- mydata['EAPI'] = eapi
- self._metadata_callback(
- mycpv, myebuild, mylocation, mydata, emtime)
+ mydata = self._metadata_callback(
+ mycpv, myebuild, mylocation, {'EAPI':eapi}, emtime)
else:
sched = TaskScheduler()
proc = EbuildMetadataPhase(cpv=mycpv, ebuild_path=myebuild,
@@ -682,13 +680,7 @@ class portdbapi(dbapi):
self._broken_ebuilds.add(myebuild)
raise KeyError(mycpv)
- mydata.update(proc.metadata)
-
- if mydata.get("INHERITED", False):
- mydata["_eclasses_"] = self._repo_info[mylocation
- ].eclass_db.get_eclass_data(mydata["INHERITED"].split())
- else:
- mydata["_eclasses_"] = {}
+ mydata = proc.metadata
# do we have a origin repository name for the current package
mydata["repository"] = self._repository_map.get(mylocation, "")