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 52675138350 for ; Sat, 29 Feb 2020 18:52:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 313B5E08F2; Sat, 29 Feb 2020 18:52:09 +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 14F5CE08F2 for ; Sat, 29 Feb 2020 18:52:08 +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 AB17334F0CD for ; Sat, 29 Feb 2020 18:52:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 066C3CF for ; Sat, 29 Feb 2020 18:52:05 +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: <1583002228.10cc6febb701cde8f7c099f5ecdf177486e94b3c.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: 10cc6febb701cde8f7c099f5ecdf177486e94b3c X-VCS-Branch: master Date: Sat, 29 Feb 2020 18:52:05 +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: f425c426-fdc7-4b35-ad43-736897e4106e X-Archives-Hash: 295bc31ed3e75160f51d3d0561b7c85f commit: 10cc6febb701cde8f7c099f5ecdf177486e94b3c Author: Zac Medico gentoo org> AuthorDate: Sat Feb 29 18:49:48 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 29 18:50:28 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=10cc6feb SpawnProcess: only cancel self._main_task if it's not done Signed-off-by: Zac Medico gentoo.org> lib/_emerge/SpawnProcess.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py index cda615ded..aef000e22 100644 --- a/lib/_emerge/SpawnProcess.py +++ b/lib/_emerge/SpawnProcess.py @@ -196,7 +196,7 @@ class SpawnProcess(SubProcess): def _cancel(self): SubProcess._cancel(self) if self._main_task is not None: - self._main_task.cancel() + self._main_task.done() or self._main_task.cancel() self._cgroup_cleanup() def _cgroup_cleanup(self):