From 458ce208ed25f2d17666926585e14da6166eb9d7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 17 Nov 2011 17:26:01 -0800 Subject: depgraph: don't merge portage asap There's no need to do this anymore, because we don't restart since commit d3f704a425a50b5cfa997a25866929b30f1b7d0f. --- pym/_emerge/depgraph.py | 9 --------- 1 file changed, 9 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 65fe1fda2..484206eb7 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4996,15 +4996,6 @@ class depgraph(object): if replacement_portage == running_portage: replacement_portage = None - if replacement_portage is not None and \ - (running_portage is None or \ - running_portage.cpv != replacement_portage.cpv or \ - '9999' in replacement_portage.cpv or \ - 'git' in replacement_portage.inherited or \ - 'git-2' in replacement_portage.inherited): - # update from running_portage to replacement_portage asap - asap_nodes.append(replacement_portage) - if running_portage is not None: try: portage_rdepend = self._select_atoms_highest_available( -- cgit v1.2.3-1-g7c22