Allow binary packages to be installed with --usepkg even when there is no ebuild...

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

diff --git a/bin/emerge b/bin/emerge
index 701684bf9efe59fc4fc25ae3bfeaf32650072f9b..ec86a363530375c2746c88beead07e4e9899463b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1018,8 +1018,9 @@ class depgraph:
                                        myeb_pkg_matches = bindb.match(x)
                                        if "--usepkgonly" not in self.myopts:
                                                # Remove any binary package entries that are masked in the portage tree (#55871)
-                                               for idx in range(len(myeb_pkg_matches)-1,-1,-1):
-                                                       if myeb_pkg_matches[idx] not in myeb_matches:
+                                               for idx in xrange(len(myeb_pkg_matches)):
+                                                       if myeb_pkg_matches[idx] not in myeb_matches and \
+                                                               portdb.cpv_exists(myeb_pkg_matches[idx]):
                                                                del myeb_pkg_matches[idx]
                                        myeb_pkg = portage.best(myeb_pkg_matches)