From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 10 Dec 2012 08:38:51 +0000 (-0800)
Subject: MergeProcess: avoid duplicate elog, bug #446136
X-Git-Tag: v2.2.0_alpha148~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=db157a4096dac7a7028357c7f1b5ae5c05eb82ae;p=portage.git

MergeProcess: avoid duplicate elog, bug #446136
---

diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py
index 9be68d3f5..cd9b122dc 100644
--- a/pym/portage/dbapi/_MergeProcess.py
+++ b/pym/portage/dbapi/_MergeProcess.py
@@ -152,6 +152,9 @@ class MergeProcess(ForkProcess):
 				self._elog_reader_fd = elog_reader_fd
 				self._buf = ""
 				self._elog_keys = set()
+				# Discard messages which will be collected by the subprocess,
+				# in order to avoid duplicates (bug #446136).
+				portage.elog.messages.collect_messages(key=mylink.mycpv)
 
 				# invalidate relevant vardbapi caches
 				if self.vartree.dbapi._categories is not None: