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 0502A158F56 for ; Mon, 16 Aug 2021 20:48:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07F47E0F0E; Mon, 16 Aug 2021 16:36:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AADE2E0F0E for ; Mon, 16 Aug 2021 16:36:14 +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 71B95347282 for ; Mon, 16 Aug 2021 16:36:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE729858 for ; Mon, 16 Aug 2021 16:36:11 +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: <1629131739.50b3efe86028e0e7d184d3a5c4a36c11f3388b6f.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.33.1-r1.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: 50b3efe86028e0e7d184d3a5c4a36c11f3388b6f X-VCS-Branch: master Date: Mon, 16 Aug 2021 16:36:11 +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: 69c76317-704b-45bf-bcac-1c28e6121595 X-Archives-Hash: 9608f36d22690a93c40ff57f0b0ffa91 commit: 50b3efe86028e0e7d184d3a5c4a36c11f3388b6f Author: Jakov Smolic sartura hr> AuthorDate: Mon Aug 16 16:31:47 2021 +0000 Commit: Sam James gentoo 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 sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/21353 Signed-off-by: Sam James 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