summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 07:20:44 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 07:20:44 +0000
commit0c3924f167816b8d081eb0c2bbc7cc1a3de5e7e3 (patch)
tree6448fb676ff1111b7d1c5bc9d5c58a4afa35f428
parentEmphasize precedence of repos.conf over layout.conf. (trunk r13371) (diff)
downloadportage-multirepo-0c3924f167816b8d081eb0c2bbc7cc1a3de5e7e3.tar.gz
portage-multirepo-0c3924f167816b8d081eb0c2bbc7cc1a3de5e7e3.tar.bz2
portage-multirepo-0c3924f167816b8d081eb0c2bbc7cc1a3de5e7e3.zip
Tweak _eclasses_ logic inside action_metadata(). (trunk r13372)
svn path=/main/branches/2.1.6/; revision=13525
-rw-r--r--pym/_emerge/__init__.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index df2efba4..57adfdff 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13381,12 +13381,12 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
else:
inherited = inherited.split()
- if inherited:
- if tree_data.src_db.complete_eclass_entries and \
- eclasses is None:
- noise.corruption(cpv, "missing _eclasses_ field")
- continue
+ if tree_data.src_db.complete_eclass_entries and \
+ eclasses is None:
+ noise.corruption(cpv, "missing _eclasses_ field")
+ continue
+ if inherited:
# Even if _eclasses_ already exists, replace it with data from
# eclass_cache, in order to insert local eclass paths.
try:
@@ -13400,6 +13400,8 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
noise.eclass_stale(cpv)
continue
src['_eclasses_'] = eclasses
+ else:
+ src['_eclasses_'] = {}
if not eapi_supported:
src = {