Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13174 - main/trunk/pym/_emerge
Date: Mon, 23 Mar 2009 21:36:35
Message-Id: E1Llrou-000675-H3@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-03-23 21:36:31 +0000 (Mon, 23 Mar 2009)
3 New Revision: 13174
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 If a package is masked by EAPI then don't show any other masking reasons.
9
10
11 Modified: main/trunk/pym/_emerge/__init__.py
12 ===================================================================
13 --- main/trunk/pym/_emerge/__init__.py 2009-03-23 21:16:27 UTC (rev 13173)
14 +++ main/trunk/pym/_emerge/__init__.py 2009-03-23 21:36:31 UTC (rev 13174)
15 @@ -1441,9 +1441,15 @@
16 if metadata is None:
17 mreasons = ["corruption"]
18 else:
19 - pkg = Package(type_name=pkg_type, root_config=root_config,
20 - cpv=cpv, built=built, installed=installed, metadata=metadata)
21 - mreasons = get_masking_status(pkg, pkgsettings, root_config)
22 + eapi = metadata['EAPI']
23 + if eapi[:1] == '-':
24 + eapi = eapi[1:]
25 + if not portage.eapi_is_supported(eapi):
26 + mreasons = ['EAPI %s' % eapi]
27 + else:
28 + pkg = Package(type_name=pkg_type, root_config=root_config,
29 + cpv=cpv, built=built, installed=installed, metadata=metadata)
30 + mreasons = get_masking_status(pkg, pkgsettings, root_config)
31 return metadata, mreasons
32
33 def show_masked_packages(masked_packages):