f873915 Fix different errors in pkgdb logic. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix different errors in pkgdb logic.

Vsevolod Stakhov committed 13 years ago

commit f87391576367014443c2264ab81a0c7d29712dff
parent d55841c

2 files changed +4 -3

modified libpkg/pkg_jobs.c

@@ -594,7 +594,8 @@ get_local_pkg(struct pkg_jobs *j, const char *origin, unsigned flag)

 static bool
 newer_than_local_pkg(struct pkg_jobs *j, struct pkg *rp, bool force)
 {
 	char *origin, *newversion, *oldversion, *oldsize;
 	char *origin, *newversion, *oldversion;
 	int64_t oldsize;
 	struct pkg *lp;
 	struct pkg_option *lo = NULL, *ro = NULL;
 	struct pkg_dep *ld = NULL, *rd = NULL;

modified libpkg/pkgdb.c

@@ -3218,13 +3218,13 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match,

 		"SELECT id, origin, name, version, comment, "
 		"prefix, desc, arch, maintainer, www, "
 		"licenselogic, flatsize, pkgsize, "
 		"cksum, path AS repopath, REPONAME('%1$s') AS dbname "
 		"cksum, path AS repopath, '%1$s' AS dbname "
 		"FROM '%1$s'.packages p";
 	assert(db != NULL);
 	assert(match == MATCH_ALL || (pattern != NULL && pattern[0] != '\0'));
 	(reponame = pkgdb_get_reponame(db, repo));
 	reponame = pkgdb_get_reponame(db, repo);
 	sql = sbuf_new_auto();
 	comp = pkgdb_get_pattern_query(pattern, match);