5ec83e3 Print repository in search. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Print repository in search.

Vsevolod Stakhov committed 11 years ago

commit 5ec83e3ff9e53cac4e3d4492bf685ec66a4d87d1
parent 7de0d15

2 files changed +3 -2

modified libpkg/pkgdb_iterator.c

@@ -84,6 +84,7 @@ static struct column_mapping {

 	{ "pkgsize",	PKG_PKGSIZE, PKG_SQLITE_INT64 },
 	{ "prefix",	PKG_PREFIX, PKG_SQLITE_STRING },
 	{ "repopath",	PKG_REPOPATH, PKG_SQLITE_STRING },
 	{ "repourl",	PKG_REPOURL, PKG_SQLITE_STRING },
 	{ "rowid",	PKG_ROWID, PKG_SQLITE_INT64 },
 	{ "time",	PKG_TIME, PKG_SQLITE_INT64 },
 	{ "uniqueid",	PKG_UNIQUEID, PKG_SQLITE_STRING },

modified libpkg/repo/binary/query.c

@@ -325,14 +325,14 @@ pkg_repo_binary_search(struct pkg_repo *repo, const char *pattern, match_t match

 		"SELECT id, origin, name, version, comment, "
 		"prefix, desc, arch, maintainer, www, "
 		"licenselogic, flatsize, pkgsize, "
 		"cksum, path AS repopath, '%1$s' AS dbname "
 		"cksum, path AS repopath, '%1$s' AS dbname, '%2$s' AS repourl "
 		"FROM packages ";
 	if (pattern == NULL || pattern[0] == '\0')
 		return (NULL);
 	sql = sbuf_new_auto();
 	sbuf_printf(sql, multireposql, repo->name);
 	sbuf_printf(sql, multireposql, repo->name, repo->url);
 	/* close the UNIONs and build the search query */
 	sbuf_cat(sql, "WHERE ");