Bug #197810 - Fix package selection logic so that it will always fall back

to an installed package when necessary.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 076b2b0073e9910375bd2bda12020a47305a61b4..60cb96e1dfaaba124f27a3fdaade0af9238dad00 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2593,14 +2593,6 @@ class depgraph(object):
                        for db, pkg_type, built, installed, db_keys in dbs:
                                if existing_node:
                                        break
-                               if installed and not find_existing_node and \
-                                       matched_packages:
-                                       # We only need to select an installed package in the
-                                       # following cases:
-                                       #   1) no available packages
-                                       #   2) available packages rejected for some reason
-                                       #      such as --newuse
-                                       continue
                                if hasattr(db, "xmatch"):
                                        cpv_list = db.xmatch("match-all", atom)
                                else: