Continue to support profile masking at least until bug #170697 is settled.

svn path=/main/trunk/; revision=6292

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index af14499d67380a735061e47dc12deb8786ab9a07..11182d1c163db689f910b6b7999f1bee40a20d08 100644 (file)
--- 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):