diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-04 22:03:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-04 22:03:48 +0000 |
| commit | 712a1d6351a5faa66dd639b6f7685ecffa500330 (patch) | |
| tree | 986dcd7852d3a32c8ba40701e83baca6c150826d /bin | |
| parent | 49e47479d907de6a495d40394c85cb3f11706205 (diff) | |
| download | portage-712a1d6351a5faa66dd639b6f7685ecffa500330.tar.gz portage-712a1d6351a5faa66dd639b6f7685ecffa500330.tar.bz2 portage-712a1d6351a5faa66dd639b6f7685ecffa500330.zip | |
Make sure that portage always has all of it's RDEPENDs installed first. (trunk r7572)
svn path=/main/branches/2.1.2/; revision=7573
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 1dcec33ca..a0f40a723 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2246,12 +2246,14 @@ class depgraph: circular_blocks = False blocker_deps = None asap_nodes = [] + portage_node = None if reversed: get_nodes = mygraph.root_nodes else: get_nodes = mygraph.leaf_nodes for cpv, node in self.pkg_node_map["/"].iteritems(): if "portage" == portage.catsplit(portage.dep_getkey(cpv))[-1]: + portage_node = node asap_nodes.append(node) break ignore_priority_soft_range = [None] @@ -2312,6 +2314,11 @@ class depgraph: return True if node not in mergeable_nodes: return False + if node is portage_node and mygraph.child_nodes(node, + ignore_priority=DepPriority.MEDIUM_SOFT): + # Make sure that portage always has all of it's + # RDEPENDs installed first. + return False selected_nodes.add(node) for child in mygraph.child_nodes(node, ignore_priority=ignore_priority): |