From nobody Tue Apr 28 19:50:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g4rds1Lrlz6c16Z for ; Tue, 28 Apr 2026 19:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4rdr6trDz3Cl2 for ; Tue, 28 Apr 2026 19:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777405857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qY+yBHWbY/zkGSNXFi+74LDXrqYap2l4h0NcOoHX9Pw=; b=vipyXIzzfw9shHVyUYu7KrkWWnTGDwwZJRhgIUKSrP0Ae0GazfwgC9URTGqSd/JbEQRBRB 5NggjmiI1NeDOJEW36jDXcGwN7bznDZaZOlLJYgHHTUV93Dl524Vewfp3cTv532lE2ixMi d5DaXRtANh276s3wfRCn6jOGrh2s6eGPUOxZiINlHTWQGkmRSATXC3KWtQR2fpTZn83kHr HaIa7OTNxfgYVfeyLiCDsRXXONyYW4si6/8PYzlFTH5jEjAFUhgfdAbjJVQmofUbxfcvIN 44hN9PQncqhtOcLXrXVrghdl/g4RfhtrjtCK+GNpOLQMzhU6RwrCZXHRuUjDew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777405857; a=rsa-sha256; cv=none; b=ijhzxmh4fntVKAynWSndwo0+mCGnFcVspugnmpSZjBn7aiGDCN9ZwuWxtzby/wwXgwIaQ8 QRG+DnNOpM53HtRuZ7+GOHtfVBEVA145XNA6GN7yKH8aoQrMTQj5IUcrFG9hgTCasW6GCv 0KKs3twjj/aRKVAEQnx/MY7nkXBzrwbXAssjcbAjZhEPSodswZgcPhLrCfG6mYQkBnoy5b v/Nq6HsMIowMQ8tTOtj+kUw6mvq5ZJL2zm7H4pq9ZTf/YfvzXMDIEXsitsYrsf8kJ2sarQ DEp5/AegbVSguQMKXvGEq8LGtUTGCALtz1OUmNrChyLHBPscWGcOAU7rcTX41w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777405857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qY+yBHWbY/zkGSNXFi+74LDXrqYap2l4h0NcOoHX9Pw=; b=glgs2TdFEon0GH8RJ4jA0QSduJhvErU3FNumOx+s6PUnIf+TS9643cXf5X26m04zTIABlw AxZSCvyY2He3LjOBU9679f3QxStPxf4bXSPUUvecWWWsH5oVXFV9sHsZ1GihOk8JvDm+bj qGLmNLcbpud/yrZkHnRUReosOjKZCLmjADM6ZJWHvmj3iNVqBKdrhoj3c9y2rW0GGtyAHQ MOE5duJFpXxGTBEDZTBKnVELTBaLIvus1hLSgbLT0Gxqo4TdIwQJJKfD+ytHitkzpWYTmr tyaVK7nu7h/cO1j3ZU9auA37xumMjKC0BpL9iJL0DHWJXAY4sZrxet0oAwZ3kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4rdr4Zcnz176b for ; Tue, 28 Apr 2026 19:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34907 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Apr 2026 19:50:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: d1c176fedfc9 - main - packages: Make create-sets.sh more robust List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1c176fedfc99d61c1dc8037ab549bec48c17bea Auto-Submitted: auto-generated Date: Tue, 28 Apr 2026 19:50:56 +0000 Message-Id: <69f10fa0.34907.7c21574e@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d1c176fedfc99d61c1dc8037ab549bec48c17bea commit d1c176fedfc99d61c1dc8037ab549bec48c17bea Author: Lexi Winter AuthorDate: 2026-04-28 19:39:14 +0000 Commit: Lexi Winter 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