62fb03c Use -F in pkg query when querying a file to be consistent with pkg info — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Use -F in pkg query when querying a file to be consistent with pkg info

Baptiste Daroussin committed 14 years ago

commit 62fb03c262a0ab0e1e6754028dd7bc3a3d132163
parent b840013

2 files changed +5 -5

modified pkg/pkg-query.8

@@ -25,7 +25,7 @@

 .Nm
 .Fl a Ao query format Ac
 .Nm
 .Fl f Ao pkg-name Ac Ao query-format Ac
 .Fl F Ao pkg-name Ac Ao query-format Ac
 .Nm
 .Fl e Ao evaluation-condition Ac Ao query-format Ac
 .Nm

@@ -40,7 +40,7 @@ The following options are supported by

 .Bl -tag -width F1
 .It Fl a
 Match all packages from the database
 .It Fl f Ar pkg-name
 .It Fl F Ar pkg-name
 Display information only for the package file
 .Ar pkg-name
 .It Fl g

modified pkg/query.c

@@ -611,7 +611,7 @@ void

 usage_query(void)
 {
 	fprintf(stderr, "usage: pkg query -a <query-format>\n");
 	fprintf(stderr, "       pkg query -f <pkg-name> <query-format>\n");
 	fprintf(stderr, "       pkg query -F <pkg-name> <query-format>\n");
 	fprintf(stderr, "       pkg query -e <evaluation> <query-format>\n");
 	fprintf(stderr, "       pkg query [-gxX] <query-format> <pattern> <...>\n\n");
 	fprintf(stderr, "For more information see 'pkg help query.'\n");

@@ -634,7 +634,7 @@ exec_query(int argc, char **argv)

 	char *condition = NULL;
 	struct sbuf *sqlcond = NULL;
 	while ((ch = getopt(argc, argv, "agxXf:e:")) != -1) {
 	while ((ch = getopt(argc, argv, "agxXF:e:")) != -1) {
 		switch (ch) {
 			case 'a':
 				match = MATCH_ALL;

@@ -648,7 +648,7 @@ exec_query(int argc, char **argv)

 			case 'X':
 				match = MATCH_EREGEX;
 				break;
 			case 'f':
 			case 'F':
 				pkgname = optarg;
 				break;
 			case 'e':