From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1149014-garchives=archives.gentoo.org@lists.gentoo.org> 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 42B60138350 for <garchives@archives.gentoo.org>; Sun, 1 Mar 2020 00:57:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55E33E09CC; Sun, 1 Mar 2020 00:57:33 +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 D3704E09CC for <gentoo-commits@lists.gentoo.org>; Sun, 1 Mar 2020 00:57:32 +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 6CF7534EF13 for <gentoo-commits@lists.gentoo.org>; Sun, 1 Mar 2020 00:57:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC5FFCF for <gentoo-commits@lists.gentoo.org>; Sun, 1 Mar 2020 00:57:28 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> 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" <zmedico@gentoo.org> Message-ID: <1583023895.1c681e0cc783ca241b1f2e1c782fccd8f1aac769.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: 1c681e0cc783ca241b1f2e1c782fccd8f1aac769 X-VCS-Branch: master Date: Sun, 1 Mar 2020 00:57:28 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 364a76c5-b6d9-4b4d-b3d3-5eae179b7d10 X-Archives-Hash: da113b142a78bc7a0390bb1a0cd09635 commit: 1c681e0cc783ca241b1f2e1c782fccd8f1aac769 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Mar 1 00:50:37 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Mar 1 00:51:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1c681e0c CompositeTask: call self.cancel() for _start_task CancelledError Signed-off-by: Zac Medico <zmedico <AT> 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 ce7136c3d..319f9f995 100644 --- a/lib/_emerge/CompositeTask.py +++ b/lib/_emerge/CompositeTask.py @@ -118,7 +118,7 @@ class CompositeTask(AsynchronousTask): try: future.result() except asyncio.CancelledError: - self.cancelled = True + self.cancel() self._was_cancelled() self._async_wait()