From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 28 Mar 2007 17:00:37 +0000 (-0000)
Subject: Convert "ebuild" and "binary" "nomerge" nodes into "installed" nodes for greater... 
X-Git-Tag: v2.1.2.3~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b9668867881dd064673cd026923c6aa49aebba9;p=portage.git

Convert "ebuild" and "binary" "nomerge" nodes into "installed" nodes for greater consistency in the depgraph. (trunk r6304:6305)

svn path=/main/branches/2.1.2/; revision=6306
---

diff --git a/bin/emerge b/bin/emerge
index 1247e2b76..3636c22cd 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1159,6 +1159,9 @@ class depgraph:
 			metadata = dict(izip(self._mydbapi_keys,
 				mydbapi.aux_get(mykey, self._mydbapi_keys)))
 			if merging == 0 and vardbapi.cpv_exists(mykey):
+				mybigkey[0] = "installed"
+				jbigkey = tuple(mybigkey)
+				mydbapi = vardbapi
 				metadata["USE"] = vardbapi.aux_get(mykey, ["USE"])[0]
 				myuse = metadata["USE"].split()
 				metadata["SLOT"] = vardbapi.aux_get(mykey, ["SLOT"])[0]