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 B44AB138334 for ; Thu, 2 Aug 2018 18:45:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC527E07F1; Thu, 2 Aug 2018 18:45:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5FA1DE07F1 for ; Thu, 2 Aug 2018 18:45:07 +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 A4D9D335CCF for ; Thu, 2 Aug 2018 18:45:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45F0B366 for ; Thu, 2 Aug 2018 18:45:04 +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: <1533235438.528bec60c4c7b32c2545d91ba4ee91e543b0d5c9.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: 528bec60c4c7b32c2545d91ba4ee91e543b0d5c9 X-VCS-Branch: master Date: Thu, 2 Aug 2018 18:45:04 +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: e6910349-0a90-4e68-b001-3cc44ece3c68 X-Archives-Hash: 8462ab67f25a67bcdc2fb85f4c32c37a commit: 528bec60c4c7b32c2545d91ba4ee91e543b0d5c9 Author: Zac Medico gentoo org> AuthorDate: Thu Aug 2 18:32:58 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 2 18:43:58 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=528bec60 Scheduler: cancel job delay timeout after main loop (bug 662668) This fixes the following error during emerge --keep-going dependency calculation: Exception in callback PollScheduler._schedule() handle: Traceback (most recent call last): File "/usr/lib64/python3.6/asyncio/events.py", line 145, in _run self._callback(*self._args) File "/usr/lib64/python3.6/site-packages/_emerge/PollScheduler.py", line 154, in _schedule self._schedule_tasks() File "/usr/lib64/python3.6/site-packages/_emerge/Scheduler.py", line 1605, in _schedule_tasks self._keep_scheduling() or self._main_exit.done()): AttributeError: 'NoneType' object has no attribute 'done' Reported-by: Rick Farina gentoo.org> Bug: https://bugs.gentoo.org/662668 lib/_emerge/Scheduler.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 422308184..49b376281 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -1436,6 +1436,9 @@ class Scheduler(PollScheduler): if self._main_loadavg_handle is not None: self._main_loadavg_handle.cancel() self._main_loadavg_handle = None + if self._job_delay_timeout_id is not None: + self._job_delay_timeout_id.cancel() + self._job_delay_timeout_id = None def _choose_pkg(self): """