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 AA792138350 for ; Sat, 29 Feb 2020 22:49:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCEF6E09DE; Sat, 29 Feb 2020 22:49:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C001FE09DE for ; Sat, 29 Feb 2020 22:49:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7ACF434F068 for ; Sat, 29 Feb 2020 22:49:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EAED10A for ; Sat, 29 Feb 2020 22:49:52 +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: <1583016231.d331f03ab25422e9afc2e752ea8e39c93a4b0bec.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/SpawnProcess.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d331f03ab25422e9afc2e752ea8e39c93a4b0bec X-VCS-Branch: master Date: Sat, 29 Feb 2020 22:49:52 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ed8a974-1116-4532-b391-3c6767dd1f22 X-Archives-Hash: b692f6f7530da333fb1d296b5be10c17 commit: d331f03ab25422e9afc2e752ea8e39c93a4b0bec Author: Zac Medico gentoo org> AuthorDate: Sat Feb 29 22:38:35 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 29 22:43:51 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d331f03a SpawnProcess: cancel pipe_logger after async_start CancelledError Signed-off-by: Zac Medico gentoo.org> lib/_emerge/SpawnProcess.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py index 941b56683..ab7971ca8 100644 --- a/lib/_emerge/SpawnProcess.py +++ b/lib/_emerge/SpawnProcess.py @@ -147,7 +147,12 @@ class SpawnProcess(SubProcess): log_file_path=log_file_path, stdout_fd=stdout_fd) self._registered = True - yield pipe_logger.async_start() + try: + yield pipe_logger.async_start() + except asyncio.CancelledError: + if pipe_logger.poll() is None: + pipe_logger.cancel() + raise self._main_task = asyncio.ensure_future( self._main(pipe_logger), loop=self.scheduler)