diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-23 06:14:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-23 06:14:10 +0000 |
| commit | e90f0a373891a497a22e00fc88bbb49154506396 (patch) | |
| tree | 367fb546e025d572cf0123bad7f069bcc847e3c8 | |
| parent | 06ce57fe59105b223d54cd9dad7bcc5e1a01b989 (diff) | |
| download | portage-e90f0a373891a497a22e00fc88bbb49154506396.tar.gz portage-e90f0a373891a497a22e00fc88bbb49154506396.tar.bz2 portage-e90f0a373891a497a22e00fc88bbb49154506396.zip | |
In getmaskingstatus(), add missing check for * in acceptable_licenses.
svn path=/main/trunk/; revision=4805
| -rw-r--r-- | pym/portage.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pym/portage.py b/pym/portage.py index 76c448c5f..3b6c35cf8 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3953,12 +3953,13 @@ def getmaskingstatus(mycpv, settings=None, portdb=None): settings.setcpv(mycpv, mydb=portdb) acceptable_licenses = settings.acceptable_licenses(mycpv) - def str_matches(myatom): - return myatom in acceptable_licenses - license_req = dep_check(mylicense, None, settings, - str_matches=str_matches)[1] - if license_req: - rValue.append(" ".join(license_req) + " license(s)") + if "*" not in acceptable_licenses: + def str_matches(myatom): + return myatom in acceptable_licenses + license_req = dep_check(mylicense, None, settings, + str_matches=str_matches)[1] + if license_req: + rValue.append(" ".join(license_req) + " license(s)") return rValue |