From 429ac3a169b63d9841547ca1a045193586271489 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Fri, 23 Jul 2010 12:38:19 +0200 Subject: Make atoms with wildcards work in package.properties --- pym/portage/package/ebuild/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pym') 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"]) -- cgit v1.2.3-1-g7c22