From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BDF81382C5 for ; Tue, 24 Apr 2018 06:57:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 602ADE0950; Tue, 24 Apr 2018 06:57:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3CC03E0950 for ; Tue, 24 Apr 2018 06:57:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C46B3335C30 for ; Tue, 24 Apr 2018 06:57:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6530027C for ; Tue, 24 Apr 2018 06:57:18 +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: <1524552978.7f1a362fea4ca0bf4cd0476ceb3a61afb8ef1a7e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildMetadataPhase.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7f1a362fea4ca0bf4cd0476ceb3a61afb8ef1a7e X-VCS-Branch: master Date: Tue, 24 Apr 2018 06:57:18 +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: be6948fa-8ddd-4ba9-89ad-44de0648e29b X-Archives-Hash: 150878f90073f480a30801346cc4af12 commit: 7f1a362fea4ca0bf4cd0476ceb3a61afb8ef1a7e Author: Zac Medico gentoo org> AuthorDate: Tue Apr 24 06:40:46 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Apr 24 06:56:18 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7f1a362f EbuildMetadataPhase._output_handler: fix event loop recursion (bug 591760) When pid exit status is not yet available, use the Subprocess _async_waitpid() method to avoid event loop recursion. Bug: https://bugs.gentoo.org/591760 pym/_emerge/EbuildMetadataPhase.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index bbb1ca9dc..1ee967532 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -144,8 +144,11 @@ class EbuildMetadataPhase(SubProcess): break else: if not self._raw_metadata[-1]: - self._unregister() - self.wait() + if self.pid is None: + self._unregister() + self._async_wait() + else: + self.self._async_waitpid() break self._unregister_if_appropriate(event)