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

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

diff --git a/bin/emerge b/bin/emerge
index dd6f09eebdfe9e002e926125f1527bb93c4cf5c6..cde8316229bcce5e0b4cd73b57a940e970c53ba8 100755 (executable)
--- 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))))