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 A909B138351 for ; Wed, 8 Apr 2020 05:56:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF02EE096E; Wed, 8 Apr 2020 05:56:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 D661BE096E for ; Wed, 8 Apr 2020 05:56:50 +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 D07E734F0CC for ; Wed, 8 Apr 2020 05:56:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B5221CF for ; Wed, 8 Apr 2020 05:56:47 +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: <1586323787.f7e36d1e9d468b5a7f502e477ba1971f8334a5d9.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: f7e36d1e9d468b5a7f502e477ba1971f8334a5d9 X-VCS-Branch: master Date: Wed, 8 Apr 2020 05:56:47 +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: 1226565b-22dc-41b9-b477-166d7d63fa31 X-Archives-Hash: a3b6e91bb19aa9598c2cf46162f134f8 commit: f7e36d1e9d468b5a7f502e477ba1971f8334a5d9 Author: Zac Medico gentoo org> AuthorDate: Wed Apr 8 04:53:39 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 8 05:29:47 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f7e36d1e Revert "SpawnProcess: cancel pipe_logger after async_start CancelledError" This reverts commit d331f03ab25422e9afc2e752ea8e39c93a4b0bec. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/SpawnProcess.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py index ab7971ca8..941b56683 100644 --- a/lib/_emerge/SpawnProcess.py +++ b/lib/_emerge/SpawnProcess.py @@ -147,12 +147,7 @@ class SpawnProcess(SubProcess): log_file_path=log_file_path, stdout_fd=stdout_fd) self._registered = True - try: - yield pipe_logger.async_start() - except asyncio.CancelledError: - if pipe_logger.poll() is None: - pipe_logger.cancel() - raise + yield pipe_logger.async_start() self._main_task = asyncio.ensure_future( self._main(pipe_logger), loop=self.scheduler)