diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-07-23 12:36:08 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-23 09:47:13 -0700 |
| commit | 0298465c7952c721ab8799736fa05bce87578482 (patch) | |
| tree | 1c50ae91a04e1f7470b59b70fc232bb019232672 | |
| parent | ecf43a2bb0fbed01c55d809a422bd6e70f708670 (diff) | |
| download | portage-0298465c7952c721ab8799736fa05bce87578482.tar.gz portage-0298465c7952c721ab8799736fa05bce87578482.tar.bz2 portage-0298465c7952c721ab8799736fa05bce87578482.zip | |
Make atoms with wildcards work in package.license
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 8 |
1 files changed, 7 insertions, 1 deletions
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"]) |