In getmaskingstatus(), add missing check for * in acceptable_licenses.
authorZac Medico <zmedico@gentoo.org>
Mon, 23 Oct 2006 06:14:10 +0000 (06:14 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 23 Oct 2006 06:14:10 +0000 (06:14 -0000)
svn path=/main/trunk/; revision=4805

pym/portage.py

index 76c448c5f330fa738c39a4b6b16c63bbafd6766b..3b6c35cf88436d07e22ab15021ad3cd129c9db36 100644 (file)
@@ -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