summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/__init__.py16
-rw-r--r--pym/portage/__init__.py20
2 files changed, 30 insertions, 6 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a73a7423b..7e8308a9a 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3312,16 +3312,18 @@ class depgraph(object):
# otherwise they slow down merge order calculation. Don't remove
# non-root nodes since they help optimize merge order in some cases
# such as revdep-rebuild.
+ removed_nodes = set()
while True:
- removed_something = False
for node in mygraph.root_nodes():
if not isinstance(node, Package) or \
node.installed or node.onlydeps:
- self.spinner.update()
- mygraph.remove(node)
- removed_something = True
- if not removed_something:
+ removed_nodes.add(node)
+ if removed_nodes:
+ self.spinner.update()
+ mygraph.difference_update(removed_nodes)
+ if not removed_nodes:
break
+ removed_nodes.clear()
self._merge_order_bias(mygraph)
def cmp_circular_bias(n1, n2):
"""
@@ -3671,6 +3673,8 @@ class depgraph(object):
prefer_asap = True
accept_root_node = False
+ mygraph.difference_update(selected_nodes)
+
for node in selected_nodes:
# Handle interactions between blockers
@@ -3706,7 +3710,7 @@ class depgraph(object):
if node[-1] != "nomerge":
retlist.append(node)
- mygraph.remove(node)
+
if isinstance(node, Uninstall):
# Include satisfied blockers in the merge list so
# that the user can see why the package had to be
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index bd32623a0..1a75bac16 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -389,6 +389,26 @@ class digraph(object):
del self.nodes[node]
self.order.remove(node)
+ def difference_update(self, t):
+ """
+ Remove all given nodes from node_set. This is more efficient
+ than multiple calls to the remove() method.
+ """
+ if isinstance(t, (list, tuple)) or \
+ not hasattr(t, "__contains__"):
+ t = frozenset(t)
+ order = []
+ for node in self.order:
+ if node not in t:
+ order.append(node)
+ continue
+ for parent in self.nodes[node][1]:
+ del self.nodes[parent][0][node]
+ for child in self.nodes[node][0]:
+ del self.nodes[child][1][node]
+ del self.nodes[node]
+ self.order = order
+
def remove_edge(self, child, parent):
"""
Remove edge in the direction from child to parent. Note that it is