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 8CEDE138334 for ; Tue, 29 Oct 2019 01:50:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90E6EE096A; Tue, 29 Oct 2019 01:50:37 +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 5DABDE096A for ; Tue, 29 Oct 2019 01:50:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 EF85134C528 for ; Tue, 29 Oct 2019 01:50:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 489BC883 for ; Tue, 29 Oct 2019 01:50:31 +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: <1572313375.f7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0.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.76-r1.ebuild sys-apps/portage/portage-2.3.76.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0 X-VCS-Branch: master Date: Tue, 29 Oct 2019 01:50:31 +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: 8fa2cd88-0d26-4a80-99ec-bf163062c168 X-Archives-Hash: a591eb57fe0ab3b253c3b42a51eabd8d commit: f7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0 Author: Zac Medico gentoo org> AuthorDate: Tue Oct 29 01:31:41 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 29 01:42:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b7f157 sys-apps/portage: 2.3.76-r1 stable revbump for bug 698046 This avoids confusing "No such file or directory" errors as demonstrated by the following test case: $ ln -s /foo/bar /tmp/sudo-1.8.29rc1.tar.gz $ wget http://distfiles.gentoo.org/distfiles/sudo-1.8.29rc1.tar.gz -O /tmp/sudo-1.8.29rc1.tar.gz /tmp/sudo-1.8.29rc1.tar.gz: No such file or directory Bug: https://bugs.gentoo.org/691278 Bug: https://bugs.gentoo.org/698046 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Zac Medico gentoo.org> .../portage/{portage-2.3.76.ebuild => portage-2.3.76-r1.ebuild} | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys-apps/portage/portage-2.3.76.ebuild b/sys-apps/portage/portage-2.3.76-r1.ebuild similarity index 94% rename from sys-apps/portage/portage-2.3.76.ebuild rename to sys-apps/portage/portage-2.3.76-r1.ebuild index 11e24d32a9f..ff8abf53e72 100644 --- a/sys-apps/portage/portage-2.3.76.ebuild +++ b/sys-apps/portage/portage-2.3.76-r1.ebuild @@ -103,6 +103,13 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + # Apply 03c54e340073620f489ca85bca94267a198174fe, + # 0299aedef74e47c0a68acf7905d8714c9578f125, and + # 1ca5b822133171b131cef3dc15dc43583893ad6b for bug 698046. + sed -e 's|rsync -avP|rsync -LtvP|' -i cnf/make.globals lib/portage/tests/util/test_getconfig.py || die + sed -e 's|if os.stat(download_path).st_size == 0:|mystat = os.lstat(download_path)\n\t\t\t\t\t\tif mystat.st_size == 0 or (stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):|' \ + -i lib/portage/package/ebuild/fetch.py || die + if use gentoo-dev; then einfo "Disabling --dynamic-deps by default for gentoo-dev..." sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \