Remove redunant population of the fakedb in depgraph.validate_blockers, since r4776...
authorZac Medico <zmedico@gentoo.org>
Sat, 21 Oct 2006 04:36:11 +0000 (04:36 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 21 Oct 2006 04:36:11 +0000 (04:36 -0000)
svn path=/main/trunk/; revision=4778

bin/emerge

index b1cd3fbc8abb0a6ab124e29e73cc40dd3b2e1757..ad42e3fb7b6137f100c7e52d365859d98f66d3bd 100755 (executable)
@@ -1416,18 +1416,6 @@ class depgraph:
                correct merge order such that mutually blocking packages are never
                installed simultaneously."""
 
-               """ It's possible that some of the nodes haven't been added to the
-               fakedb yet, so make sure they're all accounted for."""
-               for node in self.digraph.all_nodes():
-                       node_split = node.split()
-                       mytype, myroot, mykey = node_split[0:3]
-                       if mytype in self.pkg_tree_map:
-                               if node_split[3] == "nomerge":
-                                       continue
-                               mydb = self.trees[myroot][self.pkg_tree_map[mytype]].dbapi
-                               myslot = mydb.aux_get(mykey, ["SLOT"])[0]
-                               self.mydbapi[myroot].cpv_inject(mykey, myslot=myslot)
-
                for blocker in self.blocker_parents.keys():
                        mytype, myroot, mydep = blocker.split()
                        vardb = self.trees[myroot]["vartree"].dbapi