From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1185E1381F4 for ; Mon, 10 Dec 2012 08:39:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDF9421C01D; Mon, 10 Dec 2012 08:39:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4346B21C01D for ; Mon, 10 Dec 2012 08:39:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CBF133D751 for ; Mon, 10 Dec 2012 08:39:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EC811E543C for ; Mon, 10 Dec 2012 08:39:04 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1355128731.db157a4096dac7a7028357c7f1b5ae5c05eb82ae.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/_MergeProcess.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: db157a4096dac7a7028357c7f1b5ae5c05eb82ae X-VCS-Branch: master Date: Mon, 10 Dec 2012 08:39:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1bd307dd-7925-472d-bb6c-a385534aa1b5 X-Archives-Hash: 3dceb70bf5783400529c0959b7749b88 commit: db157a4096dac7a7028357c7f1b5ae5c05eb82ae Author: Zac Medico gentoo org> AuthorDate: Mon Dec 10 08:38:51 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Dec 10 08:38:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=db157a40 MergeProcess: avoid duplicate elog, bug #446136 --- pym/portage/dbapi/_MergeProcess.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index 9be68d3..cd9b122 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: