Fix another case similar to bug #184806 that can occur with --onlydeps.
authorZac Medico <zmedico@gentoo.org>
Wed, 11 Jul 2007 02:53:51 +0000 (02:53 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 11 Jul 2007 02:53:51 +0000 (02:53 -0000)
svn path=/main/trunk/; revision=7226

pym/emerge/__init__.py

index 0e96e5032c08106f20b8a4c8901b678ecc0e4acc..f93e93adcd3b2863cb85945019d4eefdc06b7b95 100644 (file)
@@ -2777,8 +2777,10 @@ class depgraph(object):
                                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