Date: Mon, 7 Oct 2024 16:01:59 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f5c847ae849a - main - pkg: prefer .pkg extension Message-ID: <202410071601.497G1xlr016927@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f5c847ae849aab9354d0956afd683f1c90bfd91e commit f5c847ae849aab9354d0956afd683f1c90bfd91e Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2024-10-07 15:11:09 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410071601.497G1xlr016927>