From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 27 Sep 2006 07:01:45 +0000 (-0000)
Subject: Make sure that all packages are in the dbapi when doing the blocker validation.
X-Git-Tag: v2.1.2~762
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d83c06a74d0d3db0b4f255467ada4c6a52738c6;p=portage.git

Make sure that all packages are in the dbapi when doing the blocker validation.

svn path=/main/trunk/; revision=4540
---

diff --git a/bin/emerge b/bin/emerge
index 2f35603a9..8bdaca5f9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1229,6 +1229,17 @@ class depgraph:
 		final state of the graph.  Thus, it's possible that mutually blocking
 		packages will be installed simultaneously a some point(s) during the
 		transition from the initial to the final state."""
+
+		""" 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:
+				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)
+
 		all_blockers = [node for node in self.digraph.all_nodes()
 				if node.split()[0] == "blocks"]
 		for blocker in all_blockers: