cf29af9 Try to fix sql syntax for candidates search. — HardenedBSD-pkg

HardenedBSD Package Manager

Try to fix sql syntax for candidates search.

Vsevolod Stakhov committed 12 years ago

commit cf29af99f428d8c3e38404be63dfa9cce5a35629
parent 49b6e47300f583af1b01042fda61c94321a3dca0

2 files changed +2 -4

modified libpkg/pkg_jobs.c

@@ -1065,8 +1065,7 @@ pkg_jobs_guess_upgrade_candidate(struct pkg_jobs *j, const char *pattern)

 		strlcpy(cpy, pos, len + 1);
 		if (pkg_jobs_try_remote_candidate(j, cpy, opattern, MATCH_EXACT) != EPKG_OK) {
 			free(cpy);
 			cpy = sqlite3_mprintf(" WHERE name REGEXP ('^' || %.*Q || '[0-9.]*$')"
 					" ORDER by origin",
 			cpy = sqlite3_mprintf(" WHERE name REGEXP ('^' || %.*Q || '[0-9.]*$')",
 					len, pos);
 			if (pkg_jobs_try_remote_candidate(j, cpy, opattern, MATCH_CONDITION)
 					== EPKG_OK)

modified libpkg/pkgdb_repo.c

@@ -1088,8 +1088,7 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match,

 	} else
 		sbuf_printf(sql, basesql, reponame, reponame);
 	if (match != MATCH_CONDITION)
 		sbuf_cat(sql, " ORDER BY name;");
 	sbuf_cat(sql, " ORDER BY name;");
 	sbuf_finish(sql);
 	pkg_debug(4, "Pkgdb: running '%s' query for %s", sbuf_get(sql), pattern);