From nobody Sat Nov 8 19:13:53 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 4d3lw14VHSz6GRGc; Sat, 08 Nov 2025 19:13:53 +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 4d3lw13pPLz42bM; Sat, 08 Nov 2025 19:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762629233; 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=sCmsCLYZfibpNH8cvFg96FSuSYDMd1TbhD7vIMqOtdE=; b=nWRAVC+OgTaVix++Yvlv0QU34zi96sEnokxJYVNAuyAc9bMqwcezZydpgF4enJ3uYYS8+1 UARWTbTdStP1aI1bA/c8juoQ6hbK32tpUZrxXpm1fZnTzt3KSTp4jIM2+sVKShcuFzrm95 kMZ5uLVv+LgHLVs0DmZTEbLNmM4oCe5I4UQC2vodQ9TveqmGsDi+n10b2aJtO9m6yon0LC d/XujLANON3bHjHV5ZcS38eDyHnnMTv6dSprlCo5WpV5PkQNKwGc4TW529TMr231cUCYbn 4ZP9z80djMDrK5DCk7XksWU6+jj5kij6Z/+nH3k4JnyEn5CzxRlj+h0IomEJRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762629233; 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=sCmsCLYZfibpNH8cvFg96FSuSYDMd1TbhD7vIMqOtdE=; b=jp+lyHqHh3EYpMtpVK+7XXn8HcQ5YKf1XjI7YZQI3N3/GRs8vPzkQdVPd7BLYltraDEvsA PmjN6bLfhzH/cvZ4dfzzrS2A7WntP42ZmnfhwDdJ/0M4WHIezQkqVwfsPHT7jJ9k8nscW4 xYcyjOFJgH7CqR0/9UfZNsdTdjoSaBEmhxahmpoQnApnEjdbgVn29ZKbIt6k7VZcV/LEPD E6oIzz54GtuF9MMLN+StkvBTQikmanqqs6S1c7o8sXO+Uda1pqj2gEcffzrnCzdx6EPvoF K4wSAOtC8YZ259NG02V8PU9CVZEkiI+j91z/Xlh59tK0JaSuLvlDZO/6s+0BGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762629233; a=rsa-sha256; cv=none; b=jiBa+vQDVQysKZAb+OV9St/8/CfGiUdlqtpU9e+FqEd2+NqKW1EV0wQI5nYG8KVu4JnKhO 6O2Z0nWvCu7TFEDzFYt5iZXylBb6mYUIbNFnS9wIy7x3OapjaogmOoJR78Driw0MIhc9IL wDj4UjFTPw5ZFm72RxxCxPkRIy+AuRsOAse6+HZyuhWmp5f+yWqM1ZueOtEnhkdRakSKxc nBKUVPG6w68RlUWqI/xn6v/DXUyi+3t+ZVZ9E6A2dxkAa1ApAquR/KwNHRl1N6fzaQ9Cj8 aEJ/ObENyZQ9FyyVrz3JtLvvoj2JZIUlvVXwxHju1j/Y/eiK/ajrSlNgdjp1eg== 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 4d3lw138WczyTj; Sat, 08 Nov 2025 19:13:53 +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 5A8JDrsQ093306; Sat, 8 Nov 2025 19:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8JDrSc093303; Sat, 8 Nov 2025 19:13:53 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:13:53 GMT Message-Id: <202511081913.5A8JDrSc093303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: addc0556ce54 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: addc0556ce547425f9810fe081b46e8472340333 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=addc0556ce547425f9810fe081b46e8472340333 commit addc0556ce547425f9810fe081b46e8472340333 Author: Mark Johnston AuthorDate: 2025-11-06 16:06:12 +0000 Commit: Mark Johnston CommitDate: 2025-11-08 19:10:18 +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") (cherry picked from commit 645352316be6901077dc1a3ce26f41934136f412) --- 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.