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 2289B138351 for ; Wed, 8 Apr 2020 05:56:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1DFCE0950; Wed, 8 Apr 2020 05:56:50 +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 A38F3E0964 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 A5EF234F0E2 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 052B31CE 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: <1586323786.044012ffdbe8e946712fa63da9c03d31d8e1047d.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/CompositeTask.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 044012ffdbe8e946712fa63da9c03d31d8e1047d 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: 88911fb5-9742-4c40-9410-4df8662b4418 X-Archives-Hash: c2d807857e1516d179f4b556c6d5104d commit: 044012ffdbe8e946712fa63da9c03d31d8e1047d Author: Zac Medico gentoo org> AuthorDate: Wed Apr 8 04:53:06 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 8 05:29:46 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=044012ff Revert "CompositeTask: call self.cancel() for _start_task CancelledError" This reverts commit 1c681e0cc783ca241b1f2e1c782fccd8f1aac769. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/CompositeTask.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_emerge/CompositeTask.py b/lib/_emerge/CompositeTask.py index 2ad1d783d..21129758a 100644 --- a/lib/_emerge/CompositeTask.py +++ b/lib/_emerge/CompositeTask.py @@ -119,7 +119,7 @@ class CompositeTask(AsynchronousTask): try: future.result() except asyncio.CancelledError: - self.cancel() + self.cancelled = True self._was_cancelled() self._async_wait()