From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Oct 2006 06:14:10 +0000 (-0000)
Subject: In getmaskingstatus(), add missing check for * in acceptable_licenses.
X-Git-Tag: v2.1.2~561
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e90f0a373891a497a22e00fc88bbb49154506396;p=portage.git

In getmaskingstatus(), add missing check for * in acceptable_licenses.

svn path=/main/trunk/; revision=4805
---

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