Date: Sat, 2 May 2026 18:08:21 +0000 From: Shawn Webb <shawn.webb@hardenedbsd.org> To: Lexi Winter <ivy@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d1c176fedfc9 - main - packages: Make create-sets.sh more robust Message-ID: <s5x3bf6b4wwowepls7hzocrnyg2bqefcircmh3m34q32ju7tb7@dchgqdp4bnhv> In-Reply-To: <69f10fa0.34907.7c21574e@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, Apr 28, 2026 at 07:50:56PM +0000, Lexi Winter wrote: > The branch main has been updated by ivy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d1c176fedfc99d61c1dc8037ab549bec48c17bea > > commit d1c176fedfc99d61c1dc8037ab549bec48c17bea > Author: Lexi Winter <ivy@FreeBSD.org> > AuthorDate: 2026-04-28 19:39:14 +0000 > Commit: Lexi Winter <ivy@FreeBSD.org> > CommitDate: 2026-04-28 19:50:42 +0000 > > packages: Make create-sets.sh more robust > > Use ${PKG_CMD} rather than bare 'pkg' to fix the build when pkg is > not in the tools path. Provide a default in case it's not set for > some reason (e.g., running the script by hand). > > Since set -- $(...) does not trigger an exit from set -e if the > command fails, this failure was silent and resulted in sets not > being built correctly if we failed to run pkg. Use a temporary > variable, which does trigger set -e, to fail correctly. > > MFC after: 2 weeks > Reviewed by: sjg > Sponsored by: https://www.patreon.com/bsdivy > Differential Revision: https://reviews.freebsd.org/D56676 > --- > release/packages/create-sets.sh | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/release/packages/create-sets.sh b/release/packages/create-sets.sh > index 46dfd543619c..3dfd8f1a3388 100755 > --- a/release/packages/create-sets.sh > +++ b/release/packages/create-sets.sh > @@ -26,6 +26,8 @@ if [ $# -lt 3 ]; then > exit 1 > fi > > +: ${PKG_CMD:="pkg"} > + > srcdir="$1"; shift > wstagedir="$1"; shift > repodir="$1"; shift > @@ -43,7 +45,8 @@ for pkg in "$repodir"/*.pkg; do > # packages. > { echo "$pkg" | grep -q '-'; } || continue > > - set -- $(pkg query -F "$pkg" '%At %n %Av' | grep '^set ') > + _tmp="$(${PKG_CMD} query -F "$pkg" '%At %n %Av' | grep '^set ')" > + set -- $_tmp > pkgname="$2" > sets="$(echo "$3" | tr , ' ')" > for set in $sets; do > After this commit, the create-sets.sh script exits with an error code, but no error message. I'm not entirely sure what's going wrong for me. Thanks, -- Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmn2PYsACgkQ/y5nonf4 4frmQg//eYfcnejKFg8NbHvwS77x+6AuciQ89xA6medXHbsmcsEQnKfkRNhBAVM+ 0ILazh0EHu3hA5vyJe7+hIjL041pFPLMc4O2V6+lwQ35xeU6XUUTgfnm38irebUB aZgF+Sq9a5nYZWvoq3RYd/4E43BJnEWvjXw/HbVdFU7VKxY8PNT6EmwRgJPlwOEe 50phboydFbZjdxOh6LkXHxvzt53ovw5bsoRgvFUj6yZqGG6KNYoOAs6PgzwW8jBC tMdSrkFbiqtPxwtlf1ZGOJXu76GgBdry0Y902mx0ufiE1MrXA0p8s4xLelqKj6E+ CR2R8Pmz+5iDx2ezJo/ZuzBnb9VCvFhdmE3M7NYTbAKLVg7cOf66wA52rfMOM8Aa RE2+vqDx9qi5B0hxcXw+6J8mYU/sP33EbtTmnUqyBiNVDQT8dqjd2INt/haesQxz k20B6K1wJh1tWqDqUSy/JHhOBHDkVUleafivvLTmTgFigbz9go81DMwviYK/3IyK AO562wwgpSLFRhj5/BC7NXoaFB/UWCR8OGOn6i89lrl3SpUsZh5M13Y2gfr2bw0a 0rnJh/fo9oPqe9SumMBtu8U8BndHhm9pNcJFQI/QD6BpP0Bn/PSwLQs+W0AIAVou SGPqwFeLS4ppfO5BJQovxoNfESovqecsBpvNaTAaAP/RGu5lWjA= =SwUf -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?s5x3bf6b4wwowepls7hzocrnyg2bqefcircmh3m34q32ju7tb7>