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 AE83E1382C5 for ; Thu, 26 Apr 2018 06:20:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBFA3E086D; Thu, 26 Apr 2018 06:20:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B5088E086D for ; Thu, 26 Apr 2018 06:20:19 +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 1E9D4335C0A for ; Thu, 26 Apr 2018 06:20:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01B85243 for ; Thu, 26 Apr 2018 06:20:16 +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: <1524723237.f7b1b61f682f3d635aaded630d8e61f1756c8023.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PipeReader.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f7b1b61f682f3d635aaded630d8e61f1756c8023 X-VCS-Branch: master Date: Thu, 26 Apr 2018 06:20:16 +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: d627299b-c0ac-43e6-a1bc-987559d64d18 X-Archives-Hash: 67ca1507488fcd82c84b3a317f4c7736 commit: f7b1b61f682f3d635aaded630d8e61f1756c8023 Author: Zac Medico gentoo org> AuthorDate: Thu Apr 26 06:12:19 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Apr 26 06:13:57 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f7b1b61f PipeReader._output_handler: use _async_wait() (bug 591760) Use _async_wait() to avoid event loop recursion. Bug: https://bugs.gentoo.org/591760 pym/_emerge/PipeReader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index a8392c329..b8e61834c 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import fcntl @@ -77,7 +77,8 @@ class PipeReader(AbstractPollTask): self._read_data.append(data) else: self._unregister() - self.wait() + self.returncode = self.returncode or os.EX_OK + self._async_wait() break self._unregister_if_appropriate(event)