Attachment #128016 for bug #188782




			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=[]

			prefer_asap = True

			for node in selected_nodes:
				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."""

Return to bug 188782

Lines 2237-2245 Link Here

(-)bin/emerge (-4 / +2 lines)
2237	self._altlist_cache[reversed] = retlist[:]	2237	self._altlist_cache[reversed] = retlist[:]
2238	return retlist	2238	return retlist
2239	mygraph=self.digraph.copy()	2239	mygraph=self.digraph.copy()
2240	for node in mygraph.order[:]:
2241	if node[-1] == "nomerge":
2242	mygraph.remove(node)
2243	self._merge_order_bias(mygraph)	2240	self._merge_order_bias(mygraph)
2244	myblockers = self.blocker_digraph.copy()	2241	myblockers = self.blocker_digraph.copy()
2245	retlist=[]	2242	retlist=[]
Lines 2431-2437 Link Here
2431	prefer_asap = True	2428	prefer_asap = True
2432		2429
2433	for node in selected_nodes:	2430	for node in selected_nodes:
2434	retlist.append(list(node))	2431	if node[-1] != "nomerge":
		2432	retlist.append(list(node))
2435	mygraph.remove(node)	2433	mygraph.remove(node)
2436	if not reversed and not circular_blocks and myblockers.contains(node):	2434	if not reversed and not circular_blocks and myblockers.contains(node):
2437	"""This node may have invalidated one or more blockers."""	2435	"""This node may have invalidated one or more blockers."""