From nobody Fri Oct 11 16:18:30 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 4XQBd23j3bz5Z5Yj; Fri, 11 Oct 2024 16:18:30 +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 4XQBd2381Vz51fP; Fri, 11 Oct 2024 16:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728663510; 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=4U4fpwKE+xiEBNMVQVDPTGfAEweykrtTm3RXM+M5W44=; b=ObRKiEOo4sm6+D+RYns83Vnx1pA42z5srBiIY1d4wA+FHvCIeGJCy1LOi3Ht/S94JHqPTY YtMgxm0dCsERhiof6yttgVOxHpWmU3DXsOLViYCz3py0U/Jfn5kwIHivfCT39+bjmKl/Fh DcFkxVg/VIYKnssyV/nx5hnABM4V9hld+PFDMnY6uTrBid3O6Dv0sP7g9HJY/Gro9lS2XT 66xVDufpfbZdTBCRdB1JOpIi/XE65UqhormYQu6F0lfiHgsw4y45yVQJ87DNaHSIUJjB4W eK2pMnhzMBNat0YXrGm2fv0vfZSdfLm2xzLB3R2PzOamKc1HYOWtCWW9eUGtig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728663510; 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=4U4fpwKE+xiEBNMVQVDPTGfAEweykrtTm3RXM+M5W44=; b=dneoMcJ5mbgYgnfy3T66q1swD3dbcVukztxmhenK7tkoCQr/rZQFdxqOCUVsW6kIoVXIBZ hHFLmc/qNABY/34l7pV5QGHX5U+HgxjqB3mvdKrdmRz80V+7ja/O6Jk4FubYH5PBlVCcjG tyZDUbQ8WKFVy+7mSdybIeItFUL1wZT4D54YhjWS/xecf3/xtya7wutNqAe8LT45LQP1Af tV6HkzMUeKUJGQBC6LE12qDAdqvp5QSZH2fMrhekHO+mKheBRL+9NBavphiLaG+5G9LPga XtsherrBfNyB6mEEWqDxd+tQ8wTe0O4TbVkX+1YdPn660tCqKGiHkVAtBByw5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728663510; a=rsa-sha256; cv=none; b=y1aYTc0LA+mWyxprptDFub699SyKdeR2YiMfwwcecYj5UReFsfQ4MwwkqQYKn1cnKtghI7 UbhcpMZhkraaoaTI62WRQlmvse1IKfdxJ+A/V1PyXEHNJ/WRXnvdAgicxp50FdwJACzE16 qILlokyEKkMuBd8Zd9q7VarQihfwWSazoRs+69r4KNjqKmAcCLacDAVQncNbbQPkVvZwz+ oKJidvvkNIhjVVt8A8olDMKAm03O6VmGh0pR6ivbg8vvkKZIYEAO6DAWyX7k0YESWwAdO+ upCgb3K1lUz0oSr94cIx/xgYMXn1HVaIkE4ES2PKaOZy5EOw3+COCrZLMWfjdg== 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 4XQBd21wkhzpKJ; Fri, 11 Oct 2024 16:18:30 +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 49BGIUaR023936; Fri, 11 Oct 2024 16:18:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BGIUj3023933; Fri, 11 Oct 2024 16:18:30 GMT (envelope-from git) Date: Fri, 11 Oct 2024 16:18:30 GMT Message-Id: <202410111618.49BGIUj3023933@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: 911ebc3d8cb3 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 911ebc3d8cb3907ec44a772aafe2310b3c8fe27c Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=911ebc3d8cb3907ec44a772aafe2310b3c8fe27c commit 911ebc3d8cb3907ec44a772aafe2310b3c8fe27c Author: Ed Maste AuthorDate: 2024-10-07 15:11:09 +0000 Commit: Ed Maste CommitDate: 2024-10-11 16:17:40 +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) (cherry picked from commit fef1f3fecd5b6e7bf040f6dd2e31177332c3c0ec) --- 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 519445e97484..7867b89e07d4 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -894,7 +894,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) @@ -1156,7 +1156,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) {