From adf04b5570ce1bee40405b90fc739228b1044a02 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 16 Aug 2007 05:02:38 +0000 Subject: Always assign higher priority to dependencies on packages that are being rebuilt (except when --emptytree is enabled since all packages are merged in that case). This optimizes merge order so that dependencies are rebuilt/updated as soon as possible. (trunk r7625) svn path=/main/branches/2.1.2/; revision=7626 --- bin/emerge | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/bin/emerge b/bin/emerge index 3207793a8..4282dc897 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1288,17 +1288,6 @@ class depgraph: return 0 del e - # normal arg, not system or world - if arg and len(self._sets) == 1 and \ - "selective" not in self.myparams: - # For revdep-rebuild, dependencies on packages specified as - # arguments are given higher priority since the currently - # installed version has been rendered useless by ABI breakage. - # It's okay to increase the priority here even if the caller - # is not revdep-rebuild. - if priority.satisfied: - priority.rebuild = True - existing_node = None if addme: existing_node = self.pkg_node_map[myroot].get(mykey) @@ -1415,6 +1404,19 @@ class depgraph: if reinstall_for_flags: self._reinstall_nodes[jbigkey] = reinstall_for_flags + if merging and \ + "empty" not in self.myparams and \ + vardbapi.match(slot_atom): + # Increase the priority of dependencies on packages that + # are being rebuilt. This optimizes merge order so that + # dependencies are rebuilt/updated as soon as possible, + # which is needed especially when emerge is called by + # revdep-rebuild since dependencies may be affected by ABI + # breakage that has rendered them useless. Don't adjust + # priority here when in "empty" mode since all packages + # are being merged in that case. + priority.rebuild = True + if rev_dep and myparent: self.digraph.addnode(myparent, jbigkey, priority=priority) -- cgit v1.2.3-1-g7c22