From nobody Fri Oct 11 15:28:12 2024 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 4XQ9W02LBTz5Z2fZ; Fri, 11 Oct 2024 15:28:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ9W01kMXz4pT3; Fri, 11 Oct 2024 15:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660492; 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=48Vu323yHvSPOFva9ivl7k3jbOVq3XjFGHaBJ5CuNY4=; b=JsBwp8gkAj3T6CJk6gk3SPYaCw7juERIOxj2X5HUgbw2MzuCiueJuOvNf6illkHmLviKoh CQULnvDoD2nAJvbW2T9TWI7se0dCdaeQGclnzZh1UfZD8xy/7b2T7dEyHr7LWPAvNBVLpJ H+GpUwmKIVeyIQI0tLFf4jCMZKbV1OPkqNwBq5O5FCiLSh8tnpqNFHdzWES1AZaB+l/d37 4W45eiJ5x+ihgvj9af7mUXpTCz+25s8UK0v/yq2+C3dsthy4Q3peJWBHNY5g1eQEfS34Hk E4/Os4ZkRcjeOIMwNU1KAdMnc3Hzj03IlYgoZdCbHILCwocVVBEAL40h7QY0ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660492; 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=48Vu323yHvSPOFva9ivl7k3jbOVq3XjFGHaBJ5CuNY4=; b=cwbsUn4i8lCelKqBbj9XjzfZGQ9dIoa9C9YahGr0st2zbEf5dtVeNufXOFOpo9SSqdhFUL S8hIkyBqyy8jebEVsWJFIo6SkqnTF2QUo5Wfxq4yB7a4tWCmdO/TbQzJn6xFXrgFqwzmUx w8WmI2LqEF20+uD41zvJk+qT7xRIq5wqLSmfMFQDQ6vpgrBdlym7JrymqPXLHmCOi3ygKY Rn0GswUIEOrdyOa2Yoya5DifQwt3+hTcDnINsJGmFgY+satcMvdcDB9blPw3mXUadyFtMB 9h981nANBPBkpOt5N6/HWnP8czGKMG6sa9G3a2YN1Js0W019cgLTkqAdQfKUxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728660492; a=rsa-sha256; cv=none; b=FLUaHgj0xcf5tFB688zq3L6ixfIu15Gae8NetDWzX+xXHHSN11dkePd18kpY2KmGQ4SE/c bfw+KyqTz0EQ3HpYItulzQbVG6DMll09BPaA/mreMG3WCQYVuR30KQDvYyHO+fyweVY8DE J4fLT7cbgnv1XwVajMCgMDD/n+BA8WN3XWaLhQYTeyRGSuuLH8EkKqFesVHJ5XzZn3+ftb Q+b3+O/iTSD0PAwayMn+Q22vXNvLtc8zPBdLUz/M56ZVDi+771+VP014YH3FVT6d2n8nyp 1nk07NBlFb9xyu4OLI+X96PR4YbJevIGWTU5DbrEqwy3qiujQoXL34G9+1nPog== 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 4XQ9W01KtrznJr; Fri, 11 Oct 2024 15:28:12 +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 49BFSCm9038260; Fri, 11 Oct 2024 15:28:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFSCgB038257; Fri, 11 Oct 2024 15:28:12 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:28:12 GMT Message-Id: <202410111528.49BFSCgB038257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fef1f3fecd5b - stable/14 - pkg: prefer .pkg extension 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fef1f3fecd5b6e7bf040f6dd2e31177332c3c0ec Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fef1f3fecd5b6e7bf040f6dd2e31177332c3c0ec commit fef1f3fecd5b6e7bf040f6dd2e31177332c3c0ec Author: Ed Maste AuthorDate: 2024-10-07 15:11:09 +0000 Commit: Ed Maste CommitDate: 2024-10-11 15:27:41 +0000 pkg: prefer .pkg extension .pkg is the default extension as of commit c244b1d8a387, falling back to .txz if not found. PR: 281924 Reviewed by: bapt Fixes: a2aac2f5e564 ("pkg(7): when bootstrapping first search for pkg.bsd file then pkg.txz") Fixes: c244b1d8a387 ("pkg: settle the uniq extension to .pkg instead of .bsd") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46977 (cherry picked from commit f5c847ae849aab9354d0956afd683f1c90bfd91e) --- usr.sbin/pkg/pkg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 0689c67cf822..b78565b9437a 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -896,7 +896,7 @@ static const char args_bootstrap_message[] = static const char args_add_message[] = "Too many arguments\n" -"Usage: pkg add [-f] [-y] {pkg.txz}\n"; +"Usage: pkg add [-f] [-y] {pkg.pkg}\n"; static int pkg_query_yes_no(void) @@ -1168,7 +1168,7 @@ main(int argc, char *argv[]) if (add_pkg) { if (pkgarg == NULL) { - fprintf(stderr, "Path to pkg.txz required\n"); + fprintf(stderr, "Path to pkg.pkg required\n"); exit(EXIT_FAILURE); } if (access(pkgarg, R_OK) == -1) {