commit:     50b3efe86028e0e7d184d3a5c4a36c11f3388b6f
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Aug 16 16:31:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 16:35:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b3efe8

sys-apps/busybox: Don't overwrite existing files when using make-symlinks

Closes: https://bugs.gentoo.org/417263
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/21353
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/busybox/{busybox-9999.ebuild => busybox-1.33.1-r1.ebuild} | 2 +-
 sys-apps/busybox/busybox-9999.ebuild                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/busybox/busybox-9999.ebuild 
b/sys-apps/busybox/busybox-1.33.1-r1.ebuild
similarity index 99%
copy from sys-apps/busybox/busybox-9999.ebuild
copy to sys-apps/busybox/busybox-1.33.1-r1.ebuild
index e9062e18e44..19eb891b560 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-1.33.1-r1.ebuild
@@ -328,7 +328,7 @@ pkg_postinst() {
                cd "${T}" || die
                mkdir _install
                tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
+               false | cp -vpPR _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 e9062e18e44..19eb891b560 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -328,7 +328,7 @@ pkg_postinst() {
                cd "${T}" || die
                mkdir _install
                tar xf busybox-links.tar -C _install || die
-               cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} 
failed"
+               false | cp -vpPR _install/* "${ROOT}"/ || die "copying links 
for ${x} failed"
        fi
 
        if use sep-usr ; then

Reply via email to