diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2018-08-02 11:32:58 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2018-08-02 11:43:58 -0700 |
| commit | 528bec60c4c7b32c2545d91ba4ee91e543b0d5c9 (patch) | |
| tree | 394c0e40ddb336afe2ad691c05af8dc23f1bd60c | |
| parent | etc-update: add arch32 to arch OS_FAMILY (for the 32-bit users) (diff) | |
| download | portage-528bec60c4c7b32c2545d91ba4ee91e543b0d5c9.tar.gz portage-528bec60c4c7b32c2545d91ba4ee91e543b0d5c9.tar.bz2 portage-528bec60c4c7b32c2545d91ba4ee91e543b0d5c9.zip | |
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: <TimerHandle when=44692.1015056609 PollScheduler._schedule()>
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 <zerochaos@gentoo.org>
Bug: https://bugs.gentoo.org/662668
| -rw-r--r-- | lib/_emerge/Scheduler.py | 3 |
1 files changed, 3 insertions, 0 deletions
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): """ |