From 4b98bd466181aad8862fd922cfce5b6f3a38aeb3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 21 Oct 2006 04:36:11 +0000 Subject: [PATCH] Remove redunant population of the fakedb in depgraph.validate_blockers, since r4776 makes it unnecessary. svn path=/main/trunk/; revision=4778 --- bin/emerge | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/bin/emerge b/bin/emerge index b1cd3fbc8..ad42e3fb7 100755 --- a/bin/emerge +++ b/bin/emerge @@ -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 -- 2.26.2