diff options
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index 805e86e0e..fc7d31d69 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2237,9 +2237,6 @@ class depgraph: self._altlist_cache[reversed] = retlist[:] return retlist mygraph=self.digraph.copy() - for node in mygraph.order[:]: - if node[-1] == "nomerge": - mygraph.remove(node) self._merge_order_bias(mygraph) myblockers = self.blocker_digraph.copy() retlist=[] @@ -2431,7 +2428,8 @@ class depgraph: prefer_asap = True for node in selected_nodes: - retlist.append(list(node)) + if node[-1] != "nomerge": + retlist.append(list(node)) mygraph.remove(node) if not reversed and not circular_blocks and myblockers.contains(node): """This node may have invalidated one or more blockers.""" |