8dc5293 Fix solver issues with cudf and digests. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix solver issues with cudf and digests.

Vsevolod Stakhov committed 12 years ago

commit 8dc5293b2f4f8e7b912ea0fa572efa015f386e99
parent 859b0ef

3 files changed +39 -19

modified libpkg/pkg_config.c

@@ -284,7 +284,7 @@ static struct config_entry c[] = {

 	[PKG_CONFIG_CUDF_SOLVER] = {
 		PKG_CONFIG_BOOL,
 		"CUDF_SOLVER",
 		"0",
 		"NO",
 		"Experimental: tells pkg to use an external CUDF solver",
 	},
 };

modified libpkg/pkg_jobs.c

@@ -93,7 +93,7 @@ void

 pkg_jobs_free(struct pkg_jobs *j)
 {
 	struct pkg_job_request *req, *tmp;
 	struct pkg_job_universe_item *un, *untmp;
 	struct pkg_job_universe_item *un, *untmp, *cur;
 	if (j == NULL)

@@ -112,7 +112,9 @@ pkg_jobs_free(struct pkg_jobs *j)

 	}
 	HASH_ITER(hh, j->universe, un, untmp) {
 		HASH_DEL(j->universe, un);
 		pkg_free(un->pkg);
 		LL_FOREACH(un, cur) {
 			pkg_free(cur->pkg);
 		}
 		free(un);
 	}
 	HASH_FREE(j->jobs, pkg, pkg_free);

@@ -190,16 +192,17 @@ pkg_jobs_handle_pkg_universe(struct pkg_jobs *j, struct pkg *pkg)

 		item->pkg = pkg;
 		HASH_ADD_KEYPTR(hh, j->universe, __DECONST(char *, origin), strlen(origin), item);
 	}
 	/* Search for the same package added */
 	LL_FOREACH(item, cur) {
 		pkg_get(cur->pkg, PKG_DIGEST, &digest_cur);
 		if (strcmp (digest, digest_cur) == 0) {
 			/* Free new package */
 			pkg_free(pkg);
 			return (EPKG_OK);
 	else {
 		/* Search for the same package added */
 		LL_FOREACH(item, cur) {
 			pkg_get(cur->pkg, PKG_DIGEST, &digest_cur);
 			if (strcmp (digest, digest_cur) == 0) {
 				/* Free new package */
 				pkg_free(pkg);
 				return (EPKG_OK);
 			}
 			tmp = cur;
 		}
 		tmp = cur;
 	}
 	item = calloc(1, sizeof (struct pkg_job_universe_item));

@@ -221,6 +224,10 @@ pkg_jobs_add_universe(struct pkg_jobs *j, struct pkg *pkg)

 	struct pkg_conflict *c = NULL;
 	struct pkg *npkg, *rpkg;
 	/* Add the requested package itself */
 	if (pkg_jobs_handle_pkg_universe(j, pkg) != EPKG_OK)
 		return (EPKG_FATAL);
 	/* Go through all depends */
 	while (pkg_deps(pkg, &d) == EPKG_OK) {
 		rpkg = NULL;

@@ -918,7 +925,8 @@ jobs_solve_fetch(struct pkg_jobs *j)

 int
 pkg_jobs_solve(struct pkg_jobs *j)
 {
 	bool dry_run = false;
 	bool dry_run = false, cudf = false;
 	int ret;
 	if ((j->flags & PKG_FLAG_DRY_RUN) == PKG_FLAG_DRY_RUN)
 		dry_run = true;

@@ -929,18 +937,30 @@ pkg_jobs_solve(struct pkg_jobs *j)

 	switch (j->type) {
 	case PKG_JOBS_AUTOREMOVE:
 		return (jobs_solve_autoremove(j));
 		ret =jobs_solve_autoremove(j);
 		break;
 	case PKG_JOBS_DEINSTALL:
 		return (jobs_solve_deinstall(j));
 		ret = jobs_solve_deinstall(j);
 		break;
 	case PKG_JOBS_UPGRADE:
 		return (jobs_solve_upgrade(j));
 		ret = jobs_solve_upgrade(j);
 		break;
 	case PKG_JOBS_INSTALL:
 		return (jobs_solve_install(j));
 		ret = jobs_solve_install(j);
 		break;
 	case PKG_JOBS_FETCH:
 		return (jobs_solve_fetch(j));
 		ret = jobs_solve_fetch(j);
 		break;
 	default:
 		return (EPKG_FATAL);
 	}
 	if (ret == EPKG_OK) {
 		if (pkg_config_bool(PKG_CONFIG_CUDF_SOLVER, &cudf) == EPKG_OK && cudf) {
 			ret = pkg_jobs_cudf_emit_file(j, j->type, stderr, j->db);
 		}
 	}
 	return (ret);
 }
 int

modified libpkg/pkgdb.c

@@ -3307,7 +3307,7 @@ 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, '%1$s' AS dbname "
 		"cksum, manifestdigest, path AS repopath, '%1$s' AS dbname "
 		"FROM '%1$s'.packages p";
 	assert(db != NULL);