summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-02-04 04:51:33 +0000
committerZac Medico <zmedico@gentoo.org>2009-02-04 04:51:33 +0000
commitd3c5ad679c754276047dfa96926ea8fe6390bcb5 (patch)
treeeaee8f90a17ec97c1178ae54d9662fa183f07f64
parent151ccf14f01005e66e1fe99d139fb5b7dd588f38 (diff)
downloadportage-d3c5ad679c754276047dfa96926ea8fe6390bcb5.tar.gz
portage-d3c5ad679c754276047dfa96926ea8fe6390bcb5.tar.bz2
portage-d3c5ad679c754276047dfa96926ea8fe6390bcb5.zip
Fix Scheduler._find_system_deps() so that it only traverses runtime deps.
svn path=/main/trunk/; revision=12581
-rw-r--r--pym/_emerge/__init__.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 4bd268244..b78095832 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9991,14 +9991,21 @@ class Scheduler(PollScheduler):
if system_set.findAtomForPackage(node):
node_stack.append(node)
+ def ignore_priority(priority):
+ """
+ Ignore non-runtime priorities.
+ """
+ if isinstance(priority, DepPriority) and \
+ (priority.runtime or priority.runtime_post):
+ return False
+ return True
+
while node_stack:
node = node_stack.pop()
if node in deep_system_deps:
continue
deep_system_deps.add(node)
- # TODO: Only traverse runtime deps since we aren't concerned about
- # buildtime deps here.
- for child in graph.child_nodes(node):
+ for child in graph.child_nodes(node, ignore_priority=ignore_priority):
if not isinstance(child, Package) or \
child.operation == "uninstall":
continue