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 4EA3C138350 for ; Thu, 9 Apr 2020 20:48:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DD85E08C2; Thu, 9 Apr 2020 20:48:52 +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 185A8E08C2 for ; Thu, 9 Apr 2020 20:48:52 +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 1E46D34EEAA for ; Thu, 9 Apr 2020 20:48:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A7112B for ; Thu, 9 Apr 2020 20:48:49 +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: <1586465228.ad325eb10bc6e8ec2a8248f8e9173911f957c0da.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/Scheduler.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ad325eb10bc6e8ec2a8248f8e9173911f957c0da X-VCS-Branch: master Date: Thu, 9 Apr 2020 20:48:49 +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: 046fe621-273b-453f-b0ff-3d3cfe8a6b8d X-Archives-Hash: 3a0dd1df193fa6efb1badb8981dec726 commit: ad325eb10bc6e8ec2a8248f8e9173911f957c0da Author: Zac Medico gentoo org> AuthorDate: Thu Apr 9 20:27:36 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Apr 9 20:47:08 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ad325eb1 _schedule_merge_wakeup: handle main loop exit Detect main loop exit and do not attempt to schedule in this case. Fixes: 389429d798a1 ("Scheduler: wakeup for empty merge queue (bug 711322)") Reported-by: Rick Farina gentoo.org> Bug: https://bugs.gentoo.org/711322 Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/Scheduler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 2c0483230..6f4564000 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -1635,7 +1635,8 @@ class Scheduler(PollScheduler): def _schedule_merge_wakeup(self, future): if not future.cancelled(): future.result() - self._schedule() + if self._main_exit is not None and not self._main_exit.done(): + self._schedule() def _sigcont_handler(self, signum, frame): self._sigcont_time = time.time()