summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 03:22:25 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 03:22:25 +0000
commit4967f78b6e3e541d7c2b7a4dde9376a73a90007c (patch)
treeb0130d2e7c3a5e0e52b26c192a75eac1fe41e8cc /pym
parentb26852ce621d0eb7fa01f0fc6f880b99f7ff1aee (diff)
downloadportage-4967f78b6e3e541d7c2b7a4dde9376a73a90007c.tar.gz
portage-4967f78b6e3e541d7c2b7a4dde9376a73a90007c.tar.bz2
portage-4967f78b6e3e541d7c2b7a4dde9376a73a90007c.zip
Make depgraph._add_dep() ignore fewer dependencies when not in --deep mode, by
making it so that it will always account for dependencies on packages that are already installed. (trunk r12546) svn path=/main/branches/2.1.6/; revision=12832
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0fabdbfeb..ab035b461 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4816,6 +4816,7 @@ class depgraph(object):
# discarded dependencies reduce the amount of information
# available for optimization of merge order.
if dep.priority.satisfied and \
+ not dep_pkg.installed and \
not (existing_node or empty or deep or update):
myarg = None
if dep.root == self.target_root: