From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 6 Nov 2007 07:26:26 +0000 (-0000)
Subject: Remove the installed package masking hack from bug #149816 since
X-Git-Tag: v2.1.3.19~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86698050dfcd6023f906bfbc84e0a988c8afffbd;p=portage.git

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
---

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)