| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:20:44 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13525 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Tweak _eclasses_ logic inside action_metadata(). (trunk r13372) |
| 9 |
|
| 10 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:20:32 UTC (rev 13524) |
| 13 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:20:44 UTC (rev 13525) |
| 14 |
@@ -13381,12 +13381,12 @@ |
| 15 |
else: |
| 16 |
inherited = inherited.split() |
| 17 |
|
| 18 |
+ if tree_data.src_db.complete_eclass_entries and \ |
| 19 |
+ eclasses is None: |
| 20 |
+ noise.corruption(cpv, "missing _eclasses_ field") |
| 21 |
+ continue |
| 22 |
+ |
| 23 |
if inherited: |
| 24 |
- if tree_data.src_db.complete_eclass_entries and \ |
| 25 |
- eclasses is None: |
| 26 |
- noise.corruption(cpv, "missing _eclasses_ field") |
| 27 |
- continue |
| 28 |
- |
| 29 |
# Even if _eclasses_ already exists, replace it with data from |
| 30 |
# eclass_cache, in order to insert local eclass paths. |
| 31 |
try: |
| 32 |
@@ -13400,6 +13400,8 @@ |
| 33 |
noise.eclass_stale(cpv) |
| 34 |
continue |
| 35 |
src['_eclasses_'] = eclasses |
| 36 |
+ else: |
| 37 |
+ src['_eclasses_'] = {} |
| 38 |
|
| 39 |
if not eapi_supported: |
| 40 |
src = { |
Archives