diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-03-09 03:34:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-09 03:34:29 +0000 |
| commit | 7355af95c05ea279116597ccde833f21821fde83 (patch) | |
| tree | 2e33a7b7ea8bc6ac3f9ddca8ce225f168be298ae | |
| parent | whoopse, s/;/:/ (diff) | |
| download | portage-idfetch-7355af95c05ea279116597ccde833f21821fde83.tar.gz portage-idfetch-7355af95c05ea279116597ccde833f21821fde83.tar.bz2 portage-idfetch-7355af95c05ea279116597ccde833f21821fde83.zip | |
Remove legacy "masked by: profile" support as per bug #149508. Profiles should use package.mask to mask unwanted versions of system packages.
svn path=/main/trunk/; revision=6195
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 17 |
2 files changed, 2 insertions, 17 deletions
@@ -3,6 +3,8 @@ News (mainly features/major bug fixes) portage-2.1.3 ------------- +* Legacy "masked by: profile" support has been removed. Profiles should use + package.mask to mask unwanted versions of system packages. * Allow per-module setting of PORTAGE_ELOG_CLASSES * Add ** as new token for package.keywords to bypass the keyword visibility layer * Namespace sanitizing: move all portage related code into portage.* namespace, diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index be170fed..08e69614 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -613,23 +613,6 @@ class portdbapi(dbapi): except ValueError: pass - revmaskdict = self.mysettings.prevmaskdict - if revmaskdict.has_key(mycp): - for x in revmaskdict[mycp]: - #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 - pos = 0 - while pos < len(newlist): - if newlist[pos] not in mymatches: - del newlist[pos] - else: - pos += 1 return newlist def gvisible(self,mylist): |