| 1 |
commit: 8d32e06295226e3914c24cd73de013748f3f9bec |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 25 06:33:18 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 25 06:37:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8d32e062 |
| 7 |
|
| 8 |
Scheduler._run_pkg_pretend: don't use local event loop |
| 9 |
|
| 10 |
Relevant hooks should be added/removed in the _merge method. |
| 11 |
|
| 12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 13 |
|
| 14 |
lib/_emerge/Scheduler.py | 6 +----- |
| 15 |
1 file changed, 1 insertion(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py |
| 18 |
index 49b376281..af43a2e24 100644 |
| 19 |
--- a/lib/_emerge/Scheduler.py |
| 20 |
+++ b/lib/_emerge/Scheduler.py |
| 21 |
@@ -775,11 +775,7 @@ class Scheduler(PollScheduler): |
| 22 |
""" |
| 23 |
|
| 24 |
failures = 0 |
| 25 |
- |
| 26 |
- # Use a local EventLoop instance here, since we don't |
| 27 |
- # want tasks here to trigger the usual Scheduler callbacks |
| 28 |
- # that handle job scheduling and status display. |
| 29 |
- sched_iface = SchedulerInterface(EventLoop(main=False)) |
| 30 |
+ sched_iface = self._sched_iface |
| 31 |
|
| 32 |
for x in self._mergelist: |
| 33 |
if not isinstance(x, Package): |
Archives