From 86698050dfcd6023f906bfbc84e0a988c8afffbd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 6 Nov 2007 07:26:26 +0000 Subject: Remove the installed package masking hack from bug #149816 since installed packages should be able to satisfy dependencies whether they are masked or not (matches current trunk behavior). svn path=/main/branches/2.1.2/; revision=8441 --- bin/emerge | 5 ----- 1 file changed, 5 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 2c79af69e..947096388 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1960,11 +1960,6 @@ class depgraph: last resort because the metadata tends to diverge from that of the ebuild in the tree.""" myeb_inst_matches = vardb.match(x) - if "--usepkgonly" not in self.myopts: - """ TODO: Improve masking check for installed and - binary packages. bug #149816""" - myeb_inst_matches = [pkg for pkg in myeb_inst_matches \ - if not portdb.cpv_exists(pkg)] myeb_inst = None if myeb_inst_matches: myeb_inst = portage.best(myeb_inst_matches) -- cgit v1.2.3-1-g7c22