Fix another case similar to bug #184806 that can occur with --onlydeps. (trunk r7226)

svn path=/main/branches/2.1.2/; revision=7227

diff --git a/bin/emerge b/bin/emerge
index e52ef132393a7e76addda2f0d06fc690f1158af3..78da49f3402c1b6a5137a50bde1ce8acb346f96a 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2756,8 +2756,10 @@ class depgraph:
                                pkg_status = x[3]
                                pkg_merge = ordered and pkg_status != "nomerge"
                                binary_package = pkg_type != "ebuild"
-                               if pkg_node in self._slot_collision_nodes:
-                                       # The metadata isn't cached due to the slot collision.
+                               if pkg_node in self._slot_collision_nodes or \
+                                       (pkg_status == "nomerge" and pkg_type != "installed"):
+                                       # The metadata isn't cached due to a slot collision or
+                                       # --onlydeps.
                                        mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi
                                else:
                                        mydbapi = self.mydbapi[myroot] # contains cached metadata