Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 188929
Collapse All | Expand All

(-)bin/emerge (-2 / +3 lines)
Lines 2205-2212 Link Here
2205
			prefer_asap = True
2205
			prefer_asap = True
2206
2206
2207
			for node in selected_nodes:
2207
			for node in selected_nodes:
2208
				if node[-1] != "nomerge":
2208
				retlist.append(list(node))
2209
					retlist.append(list(node))
2210
				mygraph.remove(node)
2209
				mygraph.remove(node)
2211
				if not reversed and not circular_blocks and myblockers.contains(node):
2210
				if not reversed and not circular_blocks and myblockers.contains(node):
2212
					"""This node may have invalidated one or more blockers."""
2211
					"""This node may have invalidated one or more blockers."""
Lines 2436-2441 Link Here
2436
			if "blocks" == x[0]:
2435
			if "blocks" == x[0]:
2437
				display_list.append((x, 0, True))
2436
				display_list.append((x, 0, True))
2438
				continue
2437
				continue
2438
			if "nomerge" == x[-1]:
2439
				continue
2439
			graph_key = tuple(x)
2440
			graph_key = tuple(x)
2440
			if "--tree" in self.myopts:
2441
			if "--tree" in self.myopts:
2441
				depth = len(tree_nodes)
2442
				depth = len(tree_nodes)

Return to bug 188929