From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 5 Dec 2012 18:01:30 +0000 (-0800)
Subject: getmaskingstatus: fix ~* KEYWORDS handling
X-Git-Tag: v2.2.0_alpha145~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f6473f300ff2e59472fb320143b2f668c6d2a447;p=portage.git

getmaskingstatus: fix ~* KEYWORDS handling

Since commit 9144faeb653b9f1dbe74c69f85cd48f26761aa2f,
KeywordsManager.getMissingKeywords() has had support for ~* in KEYWORDS
being matched by any unstable keyword in ACCEPT_KEYWORDS. However,
getmaskingstatus still returned "missing keyword" for this case. Now,
getmaskingstatus is fixed so that it won't erroneously return
"missing keyword" in this case.
---

diff --git a/pym/portage/package/ebuild/getmaskingstatus.py b/pym/portage/package/ebuild/getmaskingstatus.py
index 4dbe6a970..5c14b36ff 100644
--- a/pym/portage/package/ebuild/getmaskingstatus.py
+++ b/pym/portage/package/ebuild/getmaskingstatus.py
@@ -123,6 +123,13 @@ def _getmaskingstatus(mycpv, settings, portdb, myrepo=None):
 			if gp=="*":
 				kmask=None
 				break
+			elif gp == "~*":
+				for x in pgroups:
+					if x[:1] == "~":
+						kmask = None
+						break
+				if kmask is None:
+					break
 			elif gp=="-"+myarch and myarch in pgroups:
 				kmask="-"+myarch
 				break