From nobody Mon Nov 10 18:53:09 2025 X-Original-To: dev-commits-src-branches@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 4d4zM93jBFz6H6YG; Mon, 10 Nov 2025 18:53:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4zM91fCKz3Hqn; Mon, 10 Nov 2025 18:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800789; 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=dr9TcGf/MZp1teTnKLgwLFUJzuPNowB4x4I3xAXCRqQ=; b=VBQf2uJlGExHBACntVGpokDwY5isBq7yVrznQUy/UvZ1vd1fre0XFSURfPGMzPETfGRsl7 wSMjLkGVApLGD5ExHR5usvv4A+o1ShZrqG+neEPlfD7FJN88yclsnwBVp2jaOuRV3yqBGJ QUFya9uoyPk5TxhB9nUwcwBVflf3Y0LxpgYhY5116S7xNkiaQX1Grb0Hc7JMEd8Q/ffv6Z BUwUyK9fz8VIUjaLCkYGkdBWl8hy1uEoqL0CL2KzmDeoE2tMwqyb7kzt8ePCui7kdy15uJ qUlZrRIaL+Mplat98teT1fH1KNjk1BWT31gCvl+nqNsKZk9wkEBv7+XKcd7cpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800789; 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=dr9TcGf/MZp1teTnKLgwLFUJzuPNowB4x4I3xAXCRqQ=; b=W7GClU1IGcXCn5dZBXE9zSnx7IKUDT32wlL+uH7tFJP8TujL7tzGSdmILvxpFZSLXX66xV Rb8gz5e0hBCxwrad7MJGy5oVfQlcqwT3Y1NkDh0xvp92ojse+yV/wQYQ3A8X6B//PsiaJE J58csMV71NsOHRvcgws4Sb2oKldMUqBPjXx3P9sqiayAiWJgobwy5PFP9Hoie+1tuUbbCL l3mfSbLqNZ/txyuV4bNNFcMuOnQVKPoVjDkdOYeDInTNu8eF2XoPhO4JW2lacpsElQbxYt Th7FwrkgfKns6bFHWJzGzsM+ATXibnM48wRCp39alOJ+0IIdFrgyHcko2p3neQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762800789; a=rsa-sha256; cv=none; b=G6lhmssh6L5bKW54qVa/ZBlXOIFFLusdjBPGsE9+fWH+7+1xmRxX5/1h+jflQ9LZgGgMas 320DVS33hjUio7nHyBIje+wGsMvntVv7pZefE2cxA2ACAODutJ8I7bM9N/IfmXzHLs/MjA xZfWQkcTIyZjqe3/x2jzGKJt3Yre+wVULe1nkxZxkCieRtvFOIakwO0s3cw4waxGlSHR+2 OsjXPzqPWPOm3C9gdzDCdsIgjN2Gg4HWNahXI5p1D6WfU94HpqYvsV//X0i1BG7VLECVvE ESQul6NJqDxBctu7xlRNBI3zofO/zuCGeVWyUL1ulGb5S72vQMEm7DvoggD6KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4zM919wszVTD; Mon, 10 Nov 2025 18:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AAIr9gB092878; Mon, 10 Nov 2025 18:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIr96g092875; Mon, 10 Nov 2025 18:53:09 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:53:09 GMT Message-Id: <202511101853.5AAIr96g092875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ee234a8f1703 - releng/15.0 - freebsd-update: Swap pkg(8) flags in check_pkgbase() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ee234a8f17039ca770fda42e45ba9559bc2eb24a Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ee234a8f17039ca770fda42e45ba9559bc2eb24a commit ee234a8f17039ca770fda42e45ba9559bc2eb24a Author: Mark Johnston AuthorDate: 2025-11-06 16:06:12 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:49:08 +0000 freebsd-update: Swap pkg(8) flags in check_pkgbase() Unbootstrapped pkg will ignore -N if -r is specified first. Flip the order. Prior to commit 66c75fa63aff this worked by accident. Approved by: re (cperciva) PR: 290393 Reported by: olgeni MFC after: 3 days Fixes: 66c75fa63aff ("freebsd-update: Fix the pkgbase check") (cherry picked from commit 645352316be6901077dc1a3ce26f41934136f412) (cherry picked from commit addc0556ce547425f9810fe081b46e8472340333) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 7815502dba39..23f1106e3bde 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1103,7 +1103,7 @@ IDS_check_params () { check_pkgbase() { # Packaged base requires that pkg is bootstrapped. - if ! pkg -r ${BASEDIR} -N >/dev/null 2>/dev/null; then + if ! pkg -N -r ${BASEDIR} >/dev/null 2>/dev/null; then return 1 fi # uname(1) is used by pkg to determine ABI, so it should exist.