summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-07-23 12:38:19 +0200
committerZac Medico <zmedico@gentoo.org>2010-07-23 09:47:13 -0700
commit429ac3a169b63d9841547ca1a045193586271489 (patch)
tree06c5bb7e69888856952a26676456526d41107389 /pym
parent0298465c7952c721ab8799736fa05bce87578482 (diff)
downloadportage-429ac3a169b63d9841547ca1a045193586271489.tar.gz
portage-429ac3a169b63d9841547ca1a045193586271489.tar.bz2
portage-429ac3a169b63d9841547ca1a045193586271489.zip
Make atoms with wildcards work in package.properties
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/package/ebuild/config.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 2c92f1546..c7aa42d20 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1958,7 +1958,13 @@ class config(object):
@return: A list of properties that have not been accepted.
"""
accept_properties = self._accept_properties
- cpdict = self._ppropertiesdict.get(cpv_getkey(cpv), None)
+ cp = cpv_getkey(cpv)
+ c, p = catsplit(cp)
+ cpdict = {}
+ cpdict.update(self._ppropertiesdict.get("*/*", {}))
+ cpdict.update(self._ppropertiesdict.get(c+"/*", {}))
+ cpdict.update(self._ppropertiesdict.get("*/"+p, {}))
+ cpdict.update(self._ppropertiesdict.get(cp, {}))
if cpdict:
accept_properties = list(self._accept_properties)
cpv_slot = "%s:%s" % (cpv, metadata["SLOT"])