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 89552158092 for ; Sat, 18 Sep 2021 03:04:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE97AE07FE; Sat, 18 Sep 2021 03:04:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3FE2E0809 for ; Sat, 18 Sep 2021 03:04:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD200342F31 for ; Sat, 18 Sep 2021 03:04:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E241E5 for ; Sat, 18 Sep 2021 03:04:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631934248.5010e7702f719436b5f75dac7b9c4bf54325d98d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-1.34.0-r1.ebuild sys-apps/busybox/busybox-1.34.0.ebuild sys-apps/busybox/busybox-9999.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5010e7702f719436b5f75dac7b9c4bf54325d98d X-VCS-Branch: master Date: Sat, 18 Sep 2021 03:04:21 +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: c1b2ec90-0755-4bf8-b090-79bea3f3de05 X-Archives-Hash: 0705b192528ba0ad29ce4e1dd8d9a865 commit: 5010e7702f719436b5f75dac7b9c4bf54325d98d Author: Jakov Smolić gentoo org> AuthorDate: Fri Sep 17 13:29:47 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 18 03:04:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5010e770 sys-apps/busybox: Do not overwrite existing files with make-symlinks - Turns out previous fix did not work correctly, so let's pass 'echo n' to cp to stop it from overwriting existing files Fixes: 50b3efe86028e0e7d184d3a5c4a36c11f3388b6f Signed-off-by: Jakov Smolić gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22317 Signed-off-by: Sam James gentoo.org> sys-apps/busybox/{busybox-1.34.0.ebuild => busybox-1.34.0-r1.ebuild} | 2 +- sys-apps/busybox/busybox-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/busybox/busybox-1.34.0.ebuild b/sys-apps/busybox/busybox-1.34.0-r1.ebuild similarity index 99% rename from sys-apps/busybox/busybox-1.34.0.ebuild rename to sys-apps/busybox/busybox-1.34.0-r1.ebuild index 7b556bbba97..731b645a8e4 100644 --- a/sys-apps/busybox/busybox-1.34.0.ebuild +++ b/sys-apps/busybox/busybox-1.34.0-r1.ebuild @@ -337,7 +337,7 @@ pkg_postinst() { cd "${T}" || die mkdir _install tar xf busybox-links.tar -C _install || die - false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" fi if use sep-usr ; then diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 8297592e530..46cfa671124 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -336,7 +336,7 @@ pkg_postinst() { cd "${T}" || die mkdir _install tar xf busybox-links.tar -C _install || die - false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" fi if use sep-usr ; then