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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7C6C15838C for ; Tue, 23 Jan 2024 16:48:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C07442BC03A; Tue, 23 Jan 2024 16:48:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EA1E2BC018 for ; Tue, 23 Jan 2024 16:48:30 +0000 (UTC) Message-ID: <416b1bde323d9616dfb9d97e535b5365587b0a02.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH] cargo.eclass: add CARGO_TOML_DIR From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Tue, 23 Jan 2024 17:48:25 +0100 In-Reply-To: <20240123061347.20781a5d@Akita> References: <20240122161434.991554-1-sam@gentoo.org> <20240122193222.7d9a5b0e@Akita> <20240123061347.20781a5d@Akita> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-LwTj9TXRfvczJNUdv1gK" User-Agent: Evolution 3.50.3 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 X-Archives-Salt: 6beabbfb-3257-44dc-8867-5331ce79d96a X-Archives-Hash: 084852aedc92993e656896a289daa1a4 --=-LwTj9TXRfvczJNUdv1gK Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2024-01-23 at 06:13 -0800, orbea wrote: > On Tue, 23 Jan 2024 04:48:02 +0100 > Micha=C5=82 G=C3=B3rny wrote: >=20 > > On Mon, 2024-01-22 at 19:32 -0800, orbea wrote: > > > This is required when cargo_live_src_unpack needs to be find a > > > Cargo.toml file in a directory other than ${S} > > >=20 > > > Signed-off-by: orbea > > > --- > > > eclass/cargo.eclass | 11 ++++++++++- > > > 1 file changed, 10 insertions(+), 1 deletion(-) > > >=20 > > > diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass > > > index 3bdbb5e3ec64..692623382c56 100644 > > > --- a/eclass/cargo.eclass > > > +++ b/eclass/cargo.eclass > > > @@ -116,6 +116,15 @@ ECARGO_VENDOR=3D"${ECARGO_HOME}/gentoo" > > > # other src_functions of this eclass. > > > # Note that cargo_gen_config is automatically called by > > > cargo_src_unpack.=20 > > > +# @ECLASS_VARIABLE: CARGO_TOML_DIR > > > +# @DEFAULT_UNSET > > > +# @DESCRIPTION: > > > +# Optional variable containing the directory path to the > > > Cargo.toml file. +# Should be defined before calling > > > cargo_live_src_unpack. +# > > > +# This is required for live ebuilds when Cargo.toml in a directory > > > other +# than ${S}. > > > + > > > # @ECLASS_VARIABLE: myfeatures > > > # @DEFAULT_UNSET > > > # @DESCRIPTION: > > > @@ -403,7 +412,7 @@ cargo_live_src_unpack() { > > > umask "${EVCS_UMASK}" || die "Bad options to > > > umask: ${EVCS_UMASK}" fi > > > =20 > > > - pushd "${S}" > /dev/null || die > > > + pushd "${CARGO_TOML_DIR:-$S}" > /dev/null || die =20 > >=20 > > Please respect the current variable style. >=20 > Sorry for being dense, but could you elaborate what you mean? >=20 You changed '${S}' to '$S' which goes against the established style. --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-LwTj9TXRfvczJNUdv1gK Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQFGBAABCgAwFiEEx2qEUJQJjSjMiybFY5ra4jKeJA4FAmWv7dkSHG1nb3JueUBn ZW50b28ub3JnAAoJEGOa2uIyniQOM3wH/R/4A6Nu7zNFXL5ISjRkpG7x47NzgFSw doaVZxgKkZkR4/Piihj0A5PiNChYyfJjTSrcCp/eQR5Zw8yO3wPDyqOUcMqmycDb cfj1YhFWtFVw6zPaf5G//hiGWrcVuHOs2m+yEWvX36q2ebpbg4O4lxg5owEuRHWn qmWn7ZtXpdv03wPMGH5mqwZ+fULQklq5cRTod5+djHBWLRD0UnZc0nvtN/kM4BUp r4AKkyFo1RO8hSrDBTPfLIcgE7sN4po4NCxOm8nGySk6Xq0/hJh1rnFlexplMnPq HiNS/CDVNyHgMhRXsbAx87IPS+5t5m7uf7+ZM+99cxxWQGwPlddpcvs= =ITI6 -----END PGP SIGNATURE----- --=-LwTj9TXRfvczJNUdv1gK--