For bug #188929, return "nomerge" nodes from depgraph.altlist() so that --noreplace can add them to the world file.

svn path=/main/branches/2.1.2.9/; revision=7704
diff --git a/bin/emerge b/bin/emerge
index a681ca0..6bdb8d9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2205,8 +2205,7 @@
 			prefer_asap = True
 
 			for node in selected_nodes:
-				if node[-1] != "nomerge":
-					retlist.append(list(node))
+				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."""
@@ -2436,6 +2435,8 @@
 			if "blocks" == x[0]:
 				display_list.append((x, 0, True))
 				continue
+			if "nomerge" == x[-1]:
+				continue
 			graph_key = tuple(x)
 			if "--tree" in self.myopts:
 				depth = len(tree_nodes)