From dcac7221498c1091d436ef67d40431a133f36121 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 26 Mar 2007 20:09:35 +0000 Subject: [PATCH] Continue to support profile masking at least until bug #170697 is settled. svn path=/main/trunk/; revision=6292 --- pym/portage/dbapi/porttree.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index af14499d6..11182d1c1 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -622,6 +622,19 @@ class portdbapi(dbapi): except ValueError: pass + profile_atoms = self.mysettings.prevmaskdict.get(mycp) + if profile_atoms: + for x in profile_atoms: + #important: only match against the still-unmasked entries... + #notice how we pass "newlist" to the xmatch() call below.... + #Without this, ~ deps in the packages files are broken. + mymatches=self.xmatch("match-list",x,mylist=newlist) + if mymatches is None: + #error in packages file; print warning and continue: + print "emerge: visible(): profile packages entry \""+x+"\" is invalid, ignoring..." + continue + newlist = [cpv for cpv in newlist if cpv in mymatches] + return newlist def gvisible(self,mylist): -- 2.26.2