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 B8A28138350 for ; Tue, 3 Mar 2020 09:15:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0106E0A7D; Tue, 3 Mar 2020 09:15:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 D3F2DE0A7D for ; Tue, 3 Mar 2020 09:15:41 +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 DD0C734F3F8 for ; Tue, 3 Mar 2020 09:15:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17F11154 for ; Tue, 3 Mar 2020 09:15:39 +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: <1583226928.4a96d5d727207cfd5ce35d9c897e59440ed3f1ce.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.89-r1.ebuild sys-apps/portage/portage-2.3.89.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4a96d5d727207cfd5ce35d9c897e59440ed3f1ce X-VCS-Branch: master Date: Tue, 3 Mar 2020 09:15:39 +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: 0c3a0490-f54b-4697-aa99-df716b34314e X-Archives-Hash: a0de1c4a1c26676b9b5b0f6a8c16145e commit: 4a96d5d727207cfd5ce35d9c897e59440ed3f1ce Author: Zac Medico gentoo org> AuthorDate: Tue Mar 3 09:15:17 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 3 09:15:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a96d5d7 sys-apps/portage: stable revbump to 2.3.89-r1 for bug 711400 #711400 emerge AttributeError: 'NoneType' object has no attribute 'depth' Bug: https://bugs.gentoo.org/706142 Bug: https://bugs.gentoo.org/711400 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Zac Medico gentoo.org> sys-apps/portage/{portage-2.3.89.ebuild => portage-2.3.89-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/portage/portage-2.3.89.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild similarity index 97% rename from sys-apps/portage/portage-2.3.89.ebuild rename to sys-apps/portage/portage-2.3.89-r1.ebuild index 959994c33c8..211204f0ae8 100644 --- a/sys-apps/portage/portage-2.3.89.ebuild +++ b/sys-apps/portage/portage-2.3.89-r1.ebuild @@ -101,6 +101,9 @@ pkg_pretend() { python_prepare_all() { distutils-r1_python_prepare_all + # Apply e762752a8bf5c19e0d6d7b22de86306bfa4270ba for bug 711400. + sed -e 's|\(if\) \(graph_interface.want_update_pkg(parent, avail_pkg):\)|\1 parent is not None and \2|' -i lib/portage/dep/dep_check.py || die + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die if use gentoo-dev; then