[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Zac Medico]

commit:     7bbc98c13ec8eecf7ea291752cdbb72b60240fcf
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 20:57:43 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 21:05:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbc98c1

sys-apps/portage: 2.3.98-r1 revbump

Fix this error:

Exception in callback Scheduler._schedule_merge_wakeup(<Future finished 
result=None>)
handle: <Handle Scheduler._schedule_merge_wakeup(<Future finished result=None>)>
Traceback (most recent call last):
  File "/usr/lib/python3.7/asyncio/events.py", line 88, in _run
    self._context.run(self._callback, *self._args)
  File "/usr/lib/python3.7/site-packages/_emerge/Scheduler.py", line 1638, in 
_schedule_merge_wakeup
    self._schedule()
  File "/usr/lib/python3.7/site-packages/_emerge/PollScheduler.py", line 154, 
in _schedule
    self._schedule_tasks()
  File "/usr/lib/python3.7/site-packages/_emerge/Scheduler.py", line 1615, in 
_schedule_tasks
    self._keep_scheduling() or self._main_exit.done()):
AttributeError: 'NoneType' object has no attribute 'done'

Reported-by: Rick Farina <zerochaos <AT> gentoo.org>
Bug: https://bugs.gentoo.org/711148
Bug: https://bugs.gentoo.org/711322
Bug: https://bugs.gentoo.org/716636
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/{portage-2.3.98.ebuild => portage-2.3.98-r1.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.98.ebuild 
b/sys-apps/portage/portage-2.3.98-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.98.ebuild
rename to sys-apps/portage/portage-2.3.98-r1.ebuild
index 2892405c127..9c8a987a3ea 100644
--- a/sys-apps/portage/portage-2.3.98.ebuild
+++ b/sys-apps/portage/portage-2.3.98-r1.ebuild
@@ -93,6 +93,9 @@ pkg_pretend() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       # Apply ad325eb10bc6
+       sed -e '1638s|^\t\t\tself\._schedule()|\t\t\tif self._main_exit is not 
None and not self._main_exit.done():\n\t\t\t\tself._schedule()|' -i 
lib/_emerge/Scheduler.py || die
+
        sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i 
lib/portage/__init__.py || die
 
        if use gentoo-dev; then