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

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

diff --git a/bin/emerge b/bin/emerge
index 3ddd61c2ad7bf96e699f3007bf93712e5bff55d1..9e1ac141e7712477b207ea75afca8e52e4f385a5 100755 (executable)
--- 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: