diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-02 01:52:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-02 01:52:30 +0000 |
| commit | c807381e390c508607d50b6b761301889de1f0f6 (patch) | |
| tree | 030afb87e7922dae5d8ad1c06e5a9100e06792f6 | |
| parent | 28b66babaf51fcf4c6db0ef8d5633577e035cebe (diff) | |
| download | portage-c807381e390c508607d50b6b761301889de1f0f6.tar.gz portage-c807381e390c508607d50b6b761301889de1f0f6.tar.bz2 portage-c807381e390c508607d50b6b761301889de1f0f6.zip | |
Move medium priority out of ignore_priority_range and handle it separately.
svn path=/main/trunk/; revision=7118
| -rw-r--r-- | pym/emerge/__init__.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 89e718ea7..ac6a2d456 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2096,7 +2096,7 @@ class depgraph(object): break ignore_priority_range = [None] ignore_priority_range.extend( - xrange(DepPriority.MIN, DepPriority.MEDIUM + 1)) + xrange(DepPriority.MIN, DepPriority.SOFT + 1)) tree_mode = "--tree" in self.myopts while not mygraph.empty(): ignore_priority = None @@ -2138,7 +2138,9 @@ class depgraph(object): if not selected_nodes: # settle for a root node selected_nodes = [nodes[0]] - else: + if not nodes: + nodes = get_nodes(ignore_priority=DepPriority.MEDIUM) + if nodes: """Recursively gather a group of nodes that RDEPEND on eachother. This ensures that they are merged as a group and get their RDEPENDs satisfied as soon as possible.""" @@ -2155,10 +2157,6 @@ class depgraph(object): mergeable_nodes, selected_nodes, child): return False return True - # If necessary, resample the leaf nodes so that they - # include all nodes whose hard deps are satisfied. - if ignore_priority < DepPriority.MEDIUM: - nodes = get_nodes(ignore_priority=DepPriority.MEDIUM) mergeable_nodes = set(nodes) for ignore_priority in xrange(DepPriority.SOFT, DepPriority.MEDIUM_SOFT + 1): |