commit: 5010e7702f719436b5f75dac7b9c4bf54325d98d Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Fri Sep 17 13:29:47 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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ć <jsmolic <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22317 Signed-off-by: Sam James <sam <AT> 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
