e240851 Fix pkg upgrade — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix pkg upgrade

Baptiste Daroussin committed 14 years ago

commit e240851debb817595f40091722885605a2daac47
parent 5bd8624

1 file changed +5 -1

modified libpkg/pkgdb.c

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

 	{ "newflatsize", PKG_NEW_FLATSIZE },
 	{ "pkgsize", PKG_NEW_PKGSIZE },
 	{ "licenselogic", PKG_LICENSE_LOGIC},
 	{ "automatic", PKG_AUTOMATIC},
 	{ "rowid", PKG_ROWID},
 	{ "id", PKG_ROWID },
 	{ "weight", -1 },

@@ -856,6 +857,9 @@ pkgdb_load_deps(struct pkgdb *db, struct pkg *pkg)

 	pkg_get(pkg, PKG_REPOURL, &repourl);
 	if (repourl == NULL)
 		repourl = "remote";
 	if (pkg->type == PKG_REMOTE)
 		snprintf(sql, sizeof(sql), basesql, repourl);
 	else

@@ -2059,7 +2063,7 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, c

 		reponame = "remote";
 	}
 	sbuf_printf(sql, main_sql, reponame, reponame);
 	sbuf_printf(sql, main_sql, reponame, reponame);
 	switch (match) {
 		case MATCH_ALL: