From nobody Thu Nov 06 16:10:27 2025 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 4d2RxH53CNz653W2; Thu, 06 Nov 2025 16:10:27 +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 4d2RxH4LrTz4NHV; Thu, 06 Nov 2025 16:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762445427; 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=x/FZXiAX4cFrIQPIaFaPLCyw6qi9D2kc6jCSkdxmBXE=; b=YcQgEn7gTAUsFWHQ5hJOTA/LvB2h9G490e0Oc+vJOfNHSW2vktH+87PFTCYCAKJvvttnms YsdT7+3jWKlFvoCIIYv/pVKVqBmbItQ3tsh5f7S3ZDl5JnisCi0ni50cXZPonobAacKdXq vc5n4MrhiDajh99co5WIic9ptUHxIMWYmq67OApLYl9Cvg6oKyTcLEssWf+hTDKUJ0mjnA WuGiIOnynTwE5/oFhTUy4uCwGBfGLEM0bTx3iDURCbWYxUk0+lJ9Ue7fLVthAXNWWMGYUk Sk3q1t+IsG5eO6xicqXbIWYRQvq/D6Bnd2+k0KqpySs5l4hiMCiQ+HPIpmLD7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762445427; 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=x/FZXiAX4cFrIQPIaFaPLCyw6qi9D2kc6jCSkdxmBXE=; b=P4GvjTPZW1G0RxMyoA8vOzqy96PJ4wZ/Xb55pY2rtq7bO/q0j/arEr7s+qGv3L4QLDvlM/ 7QIwev0c5nOjQWZBxQLdksBKVJRMlzhsQTvQHZ21vJHRidCo/p19C4Wezrb179zcWxRYL2 57cAb394CZHa6fJNz5sJ8SljBaR0j4ZAxXI84842/+TTblodRGHWKADVCj/3OG5H/U8ou1 p9q8J+0KDfWcMvl6Jv3AJhPXl2WzlWAkiuMkhpwDK0R0Xd2d8lpb1wCiWL9xWM4hFpBz7k MSA7NhzXr/LliFV/OFmz+2OFYeSu0t9WkktyL+6oZtMrRtvdZg2vQKXUtXhhxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762445427; a=rsa-sha256; cv=none; b=CwluosxFzr8IeN5VIeTmzOaW3wDVM3W8aZ1GsZBIJmfafHvt4wMEt3a6dz+RaaBS/llTL6 Rls58ZAI0Np2NLsqmLeBqmIQnlEKnLbf3wVvvGM70x9N42SsUjQKGxfmFMQ6n7zFY+bPUQ k0DZql2vDK0H+xDYMNJCeNBBHAGRorEG/Z1/eGMAfsk0mHMCudGmzjoIK6g7FY0SDUf2cF gfB88iuSRNoU8Ws9guygo71jEMKriDHAqO0VUkSqwb/gyfV7v1dK6LoIFL+aOwHRONp+hF qOVuVmBxDko6HI7w8vKSHryL7BOPLVJxXbigTEkd2q9MtD+04PdwumqICdTicw== 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 4d2RxH3fWrz4r3; Thu, 06 Nov 2025 16:10:27 +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 5A6GARMs012042; Thu, 6 Nov 2025 16:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6GARAS012039; Thu, 6 Nov 2025 16:10:27 GMT (envelope-from git) Date: Thu, 6 Nov 2025 16:10:27 GMT Message-Id: <202511061610.5A6GARAS012039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 645352316be6 - main - freebsd-update: Swap pkg(8) flags in check_pkgbase() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 645352316be6901077dc1a3ce26f41934136f412 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=645352316be6901077dc1a3ce26f41934136f412 commit 645352316be6901077dc1a3ce26f41934136f412 Author: Mark Johnston AuthorDate: 2025-11-06 16:06:12 +0000 Commit: Mark Johnston CommitDate: 2025-11-06 16:06:12 +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. PR: 290393 Reported by: olgeni MFC after: 3 days Fixes: 66c75fa63aff ("freebsd-update: Fix the pkgbase check") --- 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 143d93a6dcc0..2a07bc1fb7bc 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.