From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:20:44 +0000 (-0000)
Subject: Tweak _eclasses_ logic inside action_metadata(). (trunk r13372)
X-Git-Tag: v2.1.6.12~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c3924f167816b8d081eb0c2bbc7cc1a3de5e7e3;p=portage.git

Tweak _eclasses_ logic inside action_metadata(). (trunk r13372)

svn path=/main/branches/2.1.6/; revision=13525
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index df2efba4e..57adfdffe 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 = {