From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 12 Dec 2006 11:59:42 +0000 (-0000)
Subject: For bug #157897, only let depgraph.create() inject "merge" nodes into the final state... 
X-Git-Tag: v2.1.2~311
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ebebf1d7cece3095d20e5959a4f149e565bd960;p=portage.git

For bug #157897, only let depgraph.create() inject "merge" nodes into the final state dbapi.

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

diff --git a/bin/emerge b/bin/emerge
index dd6f09eeb..cde831622 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -961,7 +961,7 @@ class depgraph:
 			self.digraph.addnode(jbigkey, myparent,
 				priority=priority)
 
-		if addme:
+		if mybigkey[-1] == "merge":
 			self.mydbapi[myroot].cpv_inject(mykey,
 				metadata=dict(izip(self._mydbapi_keys,
 				mydbapi.aux_get(mykey, self._mydbapi_keys))))