Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
make pkg search -r works
Baptiste Daroussin committed 13 years ago
commit f308d1eddf775e51be4fdc6c7fe6cd21a8f4b70b
parent d3262b9
1 file changed +4 -4
modified libpkg/pkgdb.c
@@ -3305,6 +3305,7 @@ pkgdb_search(struct pkgdb *db, const char *pattern, match_t match,
	sqlite3_stmt	*stmt = NULL;
	struct sbuf	*sql = NULL;
	int		 ret;
+
	const char	*rname;
	const char	*basesql = ""
		"SELECT id, origin, name, version, comment, "
		"prefix, desc, arch, maintainer, www, "
@@ -3328,10 +3329,9 @@ pkgdb_search(struct pkgdb *db, const char *pattern, match_t match,
	sbuf_cat(sql, ", dbname FROM (");

	if (reponame != NULL) {
-
		if (is_attached(db->sqlite, reponame)) {
-
			sbuf_printf(sql, multireposql, reponame,
-
					reponame);
-
		} else {
+
		if ((rname = pkgdb_get_reponame(db, reponame)) != NULL)
+
			sbuf_printf(sql, multireposql, rname, rname);
+
		else {
			pkg_emit_error("Repository %s can't be loaded",
					reponame);
			sbuf_delete(sql);