From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BAF8E138350 for ; Thu, 9 Apr 2020 21:05:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1533E08DA; Thu, 9 Apr 2020 21:05:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8989E08DA for ; Thu, 9 Apr 2020 21:05:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A26034EFEC for ; Thu, 9 Apr 2020 21:05:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC0CD9C for ; Thu, 9 Apr 2020 21:05:33 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1586466313.7bbc98c13ec8eecf7ea291752cdbb72b60240fcf.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/portage-2.3.98-r1.ebuild sys-apps/portage/portage-2.3.98.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7bbc98c13ec8eecf7ea291752cdbb72b60240fcf X-VCS-Branch: master Date: Thu, 9 Apr 2020 21:05:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 30e310c0-20ce-453f-9b23-06395387047c X-Archives-Hash: 6632f7e95289cea38c081ed54f6a92a8 commit: 7bbc98c13ec8eecf7ea291752cdbb72b60240fcf Author: Zac Medico gentoo org> AuthorDate: Thu Apr 9 20:57:43 2020 +0000 Commit: Zac Medico gentoo 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() handle: )> 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 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 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