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 02646138359 for ; Mon, 24 Aug 2020 03:40:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0568EE0824; Mon, 24 Aug 2020 03:40:26 +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 7ECBFE0824 for ; Mon, 24 Aug 2020 03:40:25 +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 01769335DC1 for ; Mon, 24 Aug 2020 03:40:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C87D320 for ; Mon, 24 Aug 2020 03:40:22 +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: <1598239270.b0ed587308eb3cbfafe9abcb1c59f24f48b97cdc.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/util/futures/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/util/futures/iter_completed.py X-VCS-Directories: lib/portage/util/futures/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b0ed587308eb3cbfafe9abcb1c59f24f48b97cdc X-VCS-Branch: master Date: Mon, 24 Aug 2020 03:40:22 +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: 66f2bd8b-e221-4f5e-909f-924d451be642 X-Archives-Hash: 7132fd9e1f37ca3f567bc9ed5476deff commit: b0ed587308eb3cbfafe9abcb1c59f24f48b97cdc Author: Zac Medico gentoo org> AuthorDate: Mon Aug 24 03:06:03 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Aug 24 03:21:10 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b0ed5873 async_iter_completed: fix InvalidStateError in finally clause (bug 738766) Do not attempt to wait for the TaskScheduler instance in the finally clause, since it will always raise InvalidStateError if its status is not available yet (which is normal if it has remaining tasks with done callbacks that have not been scheduled yet). Bug: https://bugs.gentoo.org/738766 Signed-off-by: Zac Medico gentoo.org> lib/portage/util/futures/iter_completed.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/portage/util/futures/iter_completed.py b/lib/portage/util/futures/iter_completed.py index 3c1a58e7e..43672171b 100644 --- a/lib/portage/util/futures/iter_completed.py +++ b/lib/portage/util/futures/iter_completed.py @@ -109,7 +109,6 @@ def async_iter_completed(futures, max_jobs=None, max_load=None, loop=None): # cleanup in case of interruption by SIGINT, etc if not loop.is_closed(): scheduler.cancel() - scheduler.wait() def iter_gather(futures, max_jobs=None, max_load=None, loop=None):