MergeProcess: avoid duplicate elog, bug #446136

diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py
index 9be68d3f5621ee6e8eb5ec8b7c69b9e24329cc11..cd9b122dc3608f8b8d5a243b60bc3e2d663800e0 100644 (file)
--- 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: