In depgraph.select_dep(), check for existing nodes in

installed packages when necessary.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 63146e93a0120743d1b000a0843bc09cfe472745..596320a92aca467203c51bd5f90f03e74decf929 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1944,7 +1944,8 @@ class depgraph(object):
                                        for db, pkg_type, built, installed, db_keys in dbs:
                                                if existing_node:
                                                        break
-                                               if installed and (matched_packages or empty):
+                                               if installed and not find_existing_node and \
+                                                       (matched_packages or empty):
                                                        # We only need to select an installed package here
                                                        # if there is no other choice.
                                                        continue