From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 16 Jul 2006 20:47:53 +0000 (-0000)
Subject: Fix broken --usepkg masking logic for bug #140694.
X-Git-Tag: v2.1.1~217
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01dace4609a3700ebc0fed8327ed47a2419d4d1d;p=portage.git

Fix broken --usepkg masking logic for bug #140694.

svn path=/main/trunk/; revision=3907
---

diff --git a/bin/emerge b/bin/emerge
index 3ddd61c2a..9e1ac141e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1052,8 +1052,8 @@ class depgraph:
 					if "--usepkgonly" not in self.myopts:
 						# Remove any binary package entries that are masked in the portage tree (#55871)
 						myeb_pkg_matches = [pkg for pkg in myeb_pkg_matches \
-							if pkg not in myeb_matches and \
-							portdb.cpv_exists(pkg)]
+							if pkg in myeb_matches or  \
+							not portdb.cpv_exists(pkg)]
 					myeb_pkg = portage.best(myeb_pkg_matches)
 
 				if not myeb_pkg: