For bug #184806, account for the fact the metadata is not cached for slot_collision_n...

svn path=/main/trunk/; revision=7214

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 6395b0d5ce08895a7092325eafa9f26f2eabf149..63ad741efaa9741216e3f4fb569d2c5b62f90025 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1747,6 +1747,9 @@ class depgraph(object):
                                # Update old-style virtuals if this package provides any.
                                # These are needed for dep_virtual calls inside dep_check.
                                p_db = self.mydbapi[p_root] # contains cached metadata
+                               if myparent in self._slot_collision_nodes:
+                                       # The metadata isn't cached due to the slot collision.
+                                       p_db = self.trees[p_root][self.pkg_tree_map[p_type]].dbapi
                                try:
                                        self.pkgsettings[p_root].setinst(p_key, p_db)
                                        # For consistency, also update the global virtuals.
@@ -2739,6 +2742,7 @@ class depgraph(object):
 
                for mylist_index in xrange(len(mylist)):
                        x, depth, ordered = mylist[mylist_index]
+                       pkg_node = tuple(x)
                        pkg_type = x[0]
                        myroot = x[1]
                        pkg_key = x[2]
@@ -2770,14 +2774,16 @@ class depgraph(object):
                                        addl += bad(" (is blocking %s)") % block_parents
                                blockers.append(addl)
                        else:
-                               mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi
                                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.
+                                       mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi
+                               else:
+                                       mydbapi = self.mydbapi[myroot] # contains cached metadata
                                metadata = dict(izip(self._mydbapi_keys,
-                                       self.mydbapi[myroot].aux_get(
-                                       pkg_key, self._mydbapi_keys)))
-                               mydbapi = self.mydbapi[myroot] # use the cached metadata
+                                       mydbapi.aux_get(pkg_key, self._mydbapi_keys)))
                                if pkg_key not in self.useFlags[myroot]:
                                        """If this is a --resume then the USE flags need to be
                                        fetched from the appropriate locations here."""