summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-12 11:59:42 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-12 11:59:42 +0000
commit1ebebf1d7cece3095d20e5959a4f149e565bd960 (patch)
tree911b0e936b3fe657bbf1df7ac9197c05b42f05b0
parent84b6c34b5e0044db1d89268ec74614b94d4c8754 (diff)
downloadportage-1ebebf1d7cece3095d20e5959a4f149e565bd960.tar.gz
portage-1ebebf1d7cece3095d20e5959a4f149e565bd960.tar.bz2
portage-1ebebf1d7cece3095d20e5959a4f149e565bd960.zip
For bug #157897, only let depgraph.create() inject "merge" nodes into the final state dbapi.
svn path=/main/trunk/; revision=5279
-rwxr-xr-xbin/emerge2
1 files changed, 1 insertions, 1 deletions
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))))