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 40D94158086 for ; Wed, 13 Oct 2021 03:33:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A3D0E07EF; Wed, 13 Oct 2021 03:33:06 +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-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A9E1E07EF for ; Wed, 13 Oct 2021 03:33:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AF02343595 for ; Wed, 13 Oct 2021 03:33:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A78D1148 for ; Wed, 13 Oct 2021 03:33:03 +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: <1634095977.4c808ca58876e0a841628a8727cf14a3cb95683b.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/k3s/k3s-1.19.15.ebuild X-VCS-Directories: sys-cluster/k3s/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4c808ca58876e0a841628a8727cf14a3cb95683b X-VCS-Branch: master Date: Wed, 13 Oct 2021 03:33:03 +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: 29cb0064-1c5f-45d4-85b0-9f2b91023f2e X-Archives-Hash: 26a9877f1267169c7dd470448618d680 commit: 4c808ca58876e0a841628a8727cf14a3cb95683b Author: Zac Medico gentoo org> AuthorDate: Wed Oct 13 03:25:47 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 13 03:32:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c808ca5 sys-cluster/k3s: Fix 1.19.15 bugs in "download" script Bug: https://bugs.gentoo.org/817842 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico gentoo.org> sys-cluster/k3s/k3s-1.19.15.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-cluster/k3s/k3s-1.19.15.ebuild b/sys-cluster/k3s/k3s-1.19.15.ebuild index d14cbd88c11..6e1358977eb 100644 --- a/sys-cluster/k3s/k3s-1.19.15.ebuild +++ b/sys-cluster/k3s/k3s-1.19.15.ebuild @@ -1479,7 +1479,8 @@ src_prepare() { # Disable download for files fetched via SRC_URI. sed -e 's:^curl:#\0:' \ -e 's:^git:#\0:' \ - -e 's:^rm -rf ${RUNC_DIR}:#\0:' \ + -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \ + -e 's:^rm -rf \${RUNC_DIR}:#\0:' \ -i scripts/download || die sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR' @@ -1495,7 +1496,7 @@ src_prepare() { src_compile() { mkdir -p build/data || die - ./scripts/download || die + "${BASH}" -ex ./scripts/download || die ./scripts/build || die ./scripts/package-cli || die }