commit: 701d5a2b5d7eda200df585e0b7ab3ed8a7cc62d3 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Oct 13 03:16:12 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Oct 13 03:32:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701d5a2b
sys-cluster/k3s: Fix 1.20.11 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 <zmedico <AT> gentoo.org> sys-cluster/k3s/k3s-1.20.11.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-cluster/k3s/k3s-1.20.11.ebuild b/sys-cluster/k3s/k3s-1.20.11.ebuild index a8751e31b0a..20b0aca0b3c 100644 --- a/sys-cluster/k3s/k3s-1.20.11.ebuild +++ b/sys-cluster/k3s/k3s-1.20.11.ebuild @@ -1594,7 +1594,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' @@ -1610,7 +1611,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 }
