3dc1887 Fix package deps loading — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix package deps loading

Marin Atanasov Nikolov committed 14 years ago

commit 3dc18874f6b0306d66f66ea7989110d297646343
parent e50d671

1 file changed +3 -6

modified libpkg/pkgdb.c

@@ -847,7 +847,7 @@ pkgdb_load_deps(struct pkgdb *db, struct pkg *pkg)

 	sqlite3_stmt *stmt = NULL;
 	int ret = EPKG_OK;
 	char sql[BUFSIZ];
 	const char *repourl;
 	const char *reponame = NULL;
 	const char *basesql = ""
 			"SELECT d.name, d.origin, d.version "
 			"FROM '%s'.deps AS d "

@@ -855,13 +855,10 @@ pkgdb_load_deps(struct pkgdb *db, struct pkg *pkg)

 	assert(db != NULL && pkg != NULL);
 	pkg_get(pkg, PKG_REPOURL, &repourl);
 	if (repourl == NULL)
 		repourl = "remote";
 	pkg_get(pkg, PKG_REPONAME, &reponame);
 	if (pkg->type == PKG_REMOTE)
 		snprintf(sql, sizeof(sql), basesql, repourl);
 		snprintf(sql, sizeof(sql), basesql, reponame);
 	else
 		snprintf(sql, sizeof(sql), basesql, "main");