Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13372 - main/trunk/pym/_emerge
Date: Sun, 19 Apr 2009 18:58:01
Message-Id: E1LvcDH-0006UO-KH@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-19 18:57:58 +0000 (Sun, 19 Apr 2009)
3 New Revision: 13372
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Tweak _eclasses_ logic inside action_metadata().
9
10
11 Modified: main/trunk/pym/_emerge/__init__.py
12 ===================================================================
13 --- main/trunk/pym/_emerge/__init__.py 2009-04-19 18:49:07 UTC (rev 13371)
14 +++ main/trunk/pym/_emerge/__init__.py 2009-04-19 18:57:58 UTC (rev 13372)
15 @@ -13557,12 +13557,12 @@
16 else:
17 inherited = inherited.split()
18
19 + if tree_data.src_db.complete_eclass_entries and \
20 + eclasses is None:
21 + noise.corruption(cpv, "missing _eclasses_ field")
22 + continue
23 +
24 if inherited:
25 - if tree_data.src_db.complete_eclass_entries and \
26 - eclasses is None:
27 - noise.corruption(cpv, "missing _eclasses_ field")
28 - continue
29 -
30 # Even if _eclasses_ already exists, replace it with data from
31 # eclass_cache, in order to insert local eclass paths.
32 try:
33 @@ -13576,6 +13576,8 @@
34 noise.eclass_stale(cpv)
35 continue
36 src['_eclasses_'] = eclasses
37 + else:
38 + src['_eclasses_'] = {}
39
40 if not eapi_supported:
41 src = {