From 0298465c7952c721ab8799736fa05bce87578482 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Fri, 23 Jul 2010 12:36:08 +0200 Subject: Make atoms with wildcards work in package.license --- pym/portage/package/ebuild/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 3ba8cc311..2c92f1546 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1873,7 +1873,13 @@ class config(object): @return: A list of licenses that have not been accepted. """ accept_license = self._accept_license - cpdict = self._plicensedict.get(cpv_getkey(cpv), None) + cp = cpv_getkey(cpv) + c, p = catsplit(cp) + cpdict = {} + cpdict.update(self._plicensedict.get("*/*", {})) + cpdict.update(self._plicensedict.get(c+"/*", {})) + cpdict.update(self._plicensedict.get("*/"+p, {})) + cpdict.update(self._plicensedict.get(cp, {})) if cpdict: accept_license = list(self._accept_license) cpv_slot = "%s:%s" % (cpv, metadata["SLOT"]) -- cgit v1.2.3-1-g7c22