Convert "ebuild" and "binary" "nomerge" nodes into "installed" nodes for greater...

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

diff --git a/bin/emerge b/bin/emerge
index 1247e2b7672dbf36bef877be67536f1ccff8f765..3636c22cde78ab32679cad145249ee6daf2243f0 100755 (executable)
--- 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]