From e026a91dc3d525b200f12d20a974d872e4033bf7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 7 Apr 2025 07:07:49 +0000 Subject: [PATCH] eclass/cargo: Sync with Gentoo It's from Gentoo commit 8c2aba680ad0a767829c1133189792081671f54d. --- .../src/third_party/portage-stable/eclass/cargo.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass index 95d485ab20..d93ae17234 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass @@ -603,12 +603,12 @@ cargo_live_src_unpack() { export CARGO_HOME="${ECARGO_REGISTRY_DIR}" # Absence of quotes around offline arg is intentional, as cargo bails out if it encounters '' - einfo "cargo fetch ${offline:+--offline}" - cargo fetch ${offline:+--offline} || die #nowarn + einfo "${CARGO} fetch ${offline:+--offline}" + "${CARGO}" fetch ${offline:+--offline} || die #nowarn # Let cargo copy all required crates to "${WORKDIR}" for offline use in later phases. - einfo "cargo vendor ${offline:+--offline} ${ECARGO_VENDOR}" - cargo vendor ${offline:+--offline} "${ECARGO_VENDOR}" || die #nowarn + einfo "${CARGO} vendor ${offline:+--offline} ${ECARGO_VENDOR}" + "${CARGO}" vendor ${offline:+--offline} "${ECARGO_VENDOR}" || die #nowarn # Users may have git checkouts made by cargo. # While cargo vendors the sources, it still needs git checkout to be present.