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 ABFEC1382C5 for ; Thu, 26 Apr 2018 08:46:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1B41E083D; Thu, 26 Apr 2018 08:46: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 BC1CBE083D for ; Thu, 26 Apr 2018 08:46:09 +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 9103C335C77 for ; Thu, 26 Apr 2018 08:46:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2505928C for ; Thu, 26 Apr 2018 08:46:07 +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: <1524731959.9b93296e14e2e7f52cd2bf4d626eb7387f6786ab.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/CompositeTask.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9b93296e14e2e7f52cd2bf4d626eb7387f6786ab X-VCS-Branch: master Date: Thu, 26 Apr 2018 08:46:07 +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-Archives-Salt: 92d598e4-e35c-4939-b0bd-46c2cfb1bc65 X-Archives-Hash: 162aeee348f6fb3dbbbab9cabbfa438d commit: 9b93296e14e2e7f52cd2bf4d626eb7387f6786ab Author: Zac Medico gentoo org> AuthorDate: Thu Apr 26 08:09:08 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Apr 26 08:39:19 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9b93296e CompositeTask._cancel(): use _async_wait() (bug 591760) After setting the returncode due to the current task being queued, use _async_wait() for consistency with the case where the current task needs to be cancelled, so that either case ultimately results in notification of exit listeners. Bug: https://bugs.gentoo.org/591760 pym/_emerge/CompositeTask.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index bfd4bacbd..113e5935f 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -18,6 +18,7 @@ class CompositeTask(AsynchronousTask): if self._current_task is self._TASK_QUEUED: self.returncode = 1 self._current_task = None + self._async_wait() else: self._current_task.cancel()