summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-10-11 14:22:29 +0000
committerZac Medico <zmedico@gentoo.org>2007-10-11 14:22:29 +0000
commitc79c017e09b4079c97242a9c62ce5c5b5c66dd44 (patch)
treef6e3ffdcfb65f2ac2e1b92ada6f86bb8ff946bb3
parentb59ba9a6df46ab0f9147f847db92e5509a0ee0fc (diff)
downloadportage-c79c017e09b4079c97242a9c62ce5c5b5c66dd44.tar.gz
portage-c79c017e09b4079c97242a9c62ce5c5b5c66dd44.tar.bz2
portage-c79c017e09b4079c97242a9c62ce5c5b5c66dd44.zip
In depgraph.select_dep(), check for existing nodes in
installed packages when necessary. svn path=/main/trunk/; revision=8050
-rw-r--r--pym/emerge/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 63146e93a..596320a92 100644
--- 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