4724885 rquery return 1 if no package matched — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

rquery return 1 if no package matched

Baptiste Daroussin committed 13 years ago

commit 47248855c8eaf7a2c879ec1ec67c9b34ab28baec
parent ed91437

1 file changed +6 -1

modified pkg/rquery.c

@@ -89,6 +89,7 @@ exec_rquery(int argc, char **argv)

 	struct sbuf *sqlcond = NULL;
 	const unsigned int q_flags_len = (sizeof(accepted_rquery_flags)/sizeof(accepted_rquery_flags[0]));
 	const char *reponame = NULL;
 	bool onematched = false;
 	while ((ch = getopt(argc, argv, "agxXe:r:")) != -1) {
 		switch (ch) {

@@ -176,8 +177,10 @@ exec_rquery(int argc, char **argv)

 			if ((it = pkgdb_rquery(db, pkgname, match, reponame)) == NULL)
 				return (EX_IOERR);
 			while ((ret = pkgdb_it_next(it, &pkg, query_flags)) == EPKG_OK)
 			while ((ret = pkgdb_it_next(it, &pkg, query_flags)) == EPKG_OK) {
 				onematched = true;
 				print_query(pkg, argv[0], multiline);
 			}
 			if (ret != EPKG_END) {
 				retcode = EX_SOFTWARE;

@@ -186,6 +189,8 @@ exec_rquery(int argc, char **argv)

 			pkgdb_it_free(it);
 		}
 		if (!onematched)
 			retcode = EXIT_FAILURE;
 	}
 	pkg_free(pkg);