| 1 |
commit: 528bec60c4c7b32c2545d91ba4ee91e543b0d5c9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 2 18:32:58 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 2 18:43:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=528bec60 |
| 7 |
|
| 8 |
Scheduler: cancel job delay timeout after main loop (bug 662668) |
| 9 |
|
| 10 |
This fixes the following error during emerge --keep-going |
| 11 |
dependency calculation: |
| 12 |
|
| 13 |
Exception in callback PollScheduler._schedule() |
| 14 |
handle: <TimerHandle when=44692.1015056609 PollScheduler._schedule()> |
| 15 |
Traceback (most recent call last): |
| 16 |
File "/usr/lib64/python3.6/asyncio/events.py", line 145, in _run |
| 17 |
self._callback(*self._args) |
| 18 |
File "/usr/lib64/python3.6/site-packages/_emerge/PollScheduler.py", line 154, in _schedule |
| 19 |
self._schedule_tasks() |
| 20 |
File "/usr/lib64/python3.6/site-packages/_emerge/Scheduler.py", line 1605, in _schedule_tasks |
| 21 |
self._keep_scheduling() or self._main_exit.done()): |
| 22 |
AttributeError: 'NoneType' object has no attribute 'done' |
| 23 |
|
| 24 |
Reported-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 25 |
Bug: https://bugs.gentoo.org/662668 |
| 26 |
|
| 27 |
lib/_emerge/Scheduler.py | 3 +++ |
| 28 |
1 file changed, 3 insertions(+) |
| 29 |
|
| 30 |
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py |
| 31 |
index 422308184..49b376281 100644 |
| 32 |
--- a/lib/_emerge/Scheduler.py |
| 33 |
+++ b/lib/_emerge/Scheduler.py |
| 34 |
@@ -1436,6 +1436,9 @@ class Scheduler(PollScheduler): |
| 35 |
if self._main_loadavg_handle is not None: |
| 36 |
self._main_loadavg_handle.cancel() |
| 37 |
self._main_loadavg_handle = None |
| 38 |
+ if self._job_delay_timeout_id is not None: |
| 39 |
+ self._job_delay_timeout_id.cancel() |
| 40 |
+ self._job_delay_timeout_id = None |
| 41 |
|
| 42 |
def _choose_pkg(self): |
| 43 |
""" |
Archives