From nobody Sat Jul 25 13:08:02 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 4h6lXL3lg1z6lNgt for ; Sat, 25 Jul 2026 13:08:02 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6lXL1dpBz3lvf for ; Sat, 25 Jul 2026 13:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784984882; 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=sz2GwCGvNOxb3wpuCS6reOgVD15nbek8O4N1WUQiSH0=; b=JqBXkGWCR7w8x3LFfj9OKge+hXzPIx9rxbqwcwf1er+AR0y//cUJhai8jQQ+csT/A8Lbmv ikWwfTjJlpeUU5k8e1TsXUVf9qNrFm7iVXL4FNo5pHTCZvhvO2vj6bdnN6qOz3wJu0Lsap o6c3ksnLJa464W9/iRUTRJHHB+6HyEMNA6s5li6EWApnIW7++5vUFKMUgEpUXC6g2rYM5s AB+Iogb1Nv8mYLbgdSege8rEcCJRyuXkHMQJ9aS4fJ3nbylExCuOAdXQPJ2kZJtY8IBjaa 9fwXJBxRmuFQPI/GHjHK1ssvQTmqQzbcTTBtg2HSH7cRQfs9AQ+ObxMkuvakoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784984882; a=rsa-sha256; cv=none; b=Nx4TZUA8FZo7sZJpiifMx+joUU7k2y5mDFcE024JLRfh4/G/bYfXHf4hc0bGgieh608cSM V18kKxQjxd/uBNG4r0kP/lfRaVxmHJ92s4DUH3sd9lVDPRyt4N8/JR/KL1hmrzq8RL+8bK bSog8jkRptiW74GOQMpSbVE9h5mxHN5S9btEFiLj/i3/nP3yL+KgOTkoZzE2YCmWLptj25 7aUvipLW6LmJCseSg0Ks/+nY4u6KDllt/zoSdGf4/QdW/mhjDXSQn/Xe9bstUqoyq/k190 q6tLrb7j408xe5FgGXM6nfRmiEK5LKgPLhaFTXFliT/4DmaMo3DHL+wvXteBVg== 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=1784984882; 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=sz2GwCGvNOxb3wpuCS6reOgVD15nbek8O4N1WUQiSH0=; b=Yto1ibpGhf5zYYPOMGt+AOqBLNtVpYuqbc8PtRNNrM1OdEOxVgcwH1RYYb8SnHmaB8eLvV vPZPxJ3+w1uiopsLGp9I9z2mvZLgy+uhGMOIa2+liZ4S2Nn2un1AnxtAP2EPbEG2yOWo+4 W3G1su4ZqyVQdKv7YUR8aHYfv5cu+g4v50ftr2ud3u0wOz4ucWvcjPCG+yShvL4mjmYqZW f1ymScymqbRzOUM/mK9MGdwIs0PmTh3BobqpvqUXWAD1ZOdUxlq0LFNOidhQZk8YEmBkdN ETE30DW10I9CQ5oizsyUoqM5z3e8ZCuAwDdB0Vqd1SdiGtd8LybdSMSd0a9G/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6lXL0VD4zf31 for ; Sat, 25 Jul 2026 13:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 268ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 13:08:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 121e955d6164 - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 121e955d6164bfc4a09b990b786d254b99cc6a95 Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 13:08:02 +0000 Message-Id: <6a64b532.268ab.b84c235@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=121e955d6164bfc4a09b990b786d254b99cc6a95 commit 121e955d6164bfc4a09b990b786d254b99cc6a95 Author: Lexi Winter AuthorDate: 2026-04-28 19:39:14 +0000 Commit: Lexi Winter CommitDate: 2026-07-25 13:01:23 +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 (cherry picked from commit d1c176fedfc99d61c1dc8037ab549bec48c17bea) --- 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