From nobody Mon Oct 07 16:01:59 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 4XMkRq1xH7z5YMrb; Mon, 07 Oct 2024 16:01:59 +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 4XMkRq1V3Jz4TPP; Mon, 7 Oct 2024 16:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728316919; 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=y+yV3Xucau/qgu+mfNXXWOdiqkrrVeJznWWLe5+2tzc=; b=c5G5FtgE+2XJPHlIsnK0d/skEZ5T2y3nhY3ScaSoehYFrV+44AB6OlXBwHkdJi9bYIc34x +5NJauqYbMh8mNwPQCNLZxfrqwFVmusdD62wIZtL9FZgqaTDr+uvaBDenchg0l4G0YrhLj XGi2a4qKb6WsADg+zUtyU9X2Fn9rJHwXjT8j4nLOOztWt36Uv0OcmD4HUvr3KNpZs39i8i P8sXQCjJ0Zi9a9ChOsVKcoz7qw+US3+4qKnFcaK0OGK4MVSGBto6d98nIi0RoR1EizKimC E/dS1qsNcb8AxBSVyk+VxUNn3/9TKU2ulKL2jtq3syan+1tTMmu6H+SdUl+sCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728316919; 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=y+yV3Xucau/qgu+mfNXXWOdiqkrrVeJznWWLe5+2tzc=; b=iObehK5SKXtHdiS29EsG2ErlT7LLwb0SyJ1W0+oLqeodqLI5g5CA4gK1qByYuKQKKFXrjw 2t97anSmpeZPTR175TM+HnLuK5j7ULJpJICSL9iePmBoN4lzZx2LH+M74geT4XI3d+hMtC EDtWcFwCiEnoM/axP2LUzz7Mi3eoLYOt3qR/95t775/uNnlFu2Ymw72fZFG3h8B3faVSl+ PFz8IKk3pSuTCykVk5l0sQYJPq0mpZMwUI8SQLs4u+RQ9YCVVwSuTm+fVPXN4qT+TLhrqt TWZNz3T1L7yP1N5ct4Ht0+uhFkYXcAkP+qX014bwH7ANAQSU3dyMaoujVR/tKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728316919; a=rsa-sha256; cv=none; b=XBA2ciTwC+4iL2YIDiCo09LBLCSbHhirmSsGkUIh6NLk911J84oOT2etfugyGsqKsaIxoZ RvjLVZjWMYhuYj1gknqV2LY543M+KZZPUTbkfYLdXasUUQA622GHhGWpFNfSSJp/zBlg7G 5vFQRMy21Zq1tIF60rVuXRJopf3xipOoa3SA5KIHF37Z81wEUw8tA/7Z1uAOyGz1S4ORG+ e1QymjymoZEBKLLfWroNTPZqFvsXC5+us2fNOfVLOfHcf3RdA7sTNK1wNIvVxwL8vM4/rg d7hAqOaHz2vfcWc1SOib3kbqmLHf67UZ8Uk/Dspt4VZEkQWY2yY1vdGLbf2a+Q== 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 4XMkRq14pyzt9H; Mon, 7 Oct 2024 16:01:59 +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 497G1xMO016930; Mon, 7 Oct 2024 16:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 497G1xlr016927; Mon, 7 Oct 2024 16:01:59 GMT (envelope-from git) Date: Mon, 7 Oct 2024 16:01:59 GMT Message-Id: <202410071601.497G1xlr016927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f5c847ae849a - main - 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/main X-Git-Reftype: branch X-Git-Commit: f5c847ae849aab9354d0956afd683f1c90bfd91e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f5c847ae849aab9354d0956afd683f1c90bfd91e commit f5c847ae849aab9354d0956afd683f1c90bfd91e Author: Ed Maste AuthorDate: 2024-10-07 15:11:09 +0000 Commit: Ed Maste CommitDate: 2024-10-07 16:01:36 +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 --- 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 70086886fbc5..cc23ffb8c257 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -895,7 +895,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) @@ -1167,7 +1167,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) {