summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-04-09 13:57:43 -0700
committerZac Medico <zmedico@gentoo.org>2020-04-09 14:05:13 -0700
commit7bbc98c13ec8eecf7ea291752cdbb72b60240fcf (patch)
tree0b1c1e9b379ecb3598f8364ba7d7637576a75cb4 /sys-apps/portage
parentgames-strategy/freeorion: Drop old (diff)
downloadgentoo-7bbc98c13ec8eecf7ea291752cdbb72b60240fcf.tar.gz
gentoo-7bbc98c13ec8eecf7ea291752cdbb72b60240fcf.tar.bz2
gentoo-7bbc98c13ec8eecf7ea291752cdbb72b60240fcf.zip
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@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@gentoo.org>
Diffstat (limited to 'sys-apps/portage')
-rw-r--r--sys-apps/portage/portage-2.3.98-r1.ebuild (renamed from sys-apps/portage/portage-2.3.98.ebuild)3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys-apps/portage/portage-2.3.98.ebuild b/sys-apps/portage/portage-2.3.98-r1.ebuild
index 2892405c127b..9c8a987a3eaf 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