Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7db301e
libpkg: Eliminate an unneeded flag variable in struct pkg_solved
Mark Johnston committed 4 years ago
commit 7db301ed714083e8cec2bbf0a7df6ed220077a2c
parent 9de47aa
2 files changed +7 -12
modified libpkg/pkg_jobs.c
@@ -568,8 +568,7 @@ pkg_jobs_set_execute_priority(struct pkg_jobs *j, struct pkg_solved *solved)
{

	struct pkg_solved *ts;
- 
	if (solved->type == PKG_SOLVED_UPGRADE
- 
			&& solved->items[1]->pkg->conflicts != NULL) {
+ 
	if (solved->type == PKG_SOLVED_UPGRADE && solved->items[1]->pkg->conflicts != NULL) {

		/*

		 * We have an upgrade request that has some conflicting packages, therefore

		 * update priorities of local packages and try to update priorities of remote ones
@@ -577,8 +576,7 @@ pkg_jobs_set_execute_priority(struct pkg_jobs *j, struct pkg_solved *solved)
		if (solved->items[0]->priority == 0)

			pkg_jobs_update_conflict_priority(j->universe, solved);
- 
		if (solved->items[1]->priority > solved->items[0]->priority &&
- 
				!solved->already_deleted) {
+ 
		if (solved->items[1]->priority > solved->items[0]->priority) {

			/*

			 * Split conflicting upgrade request into delete -> upgrade request

			 */
@@ -588,8 +586,7 @@ pkg_jobs_set_execute_priority(struct pkg_jobs *j, struct pkg_solved *solved)
			solved->items[1] = NULL;

			solved->type = PKG_SOLVED_UPGRADE_INSTALL;

			DL_APPEND(j->jobs, ts);
- 
			j->count ++;
- 
			solved->already_deleted = true;
+ 
			j->count++;

			pkg_debug(2, "split upgrade request for %s",

			   ts->items[0]->pkg->uid);

			return (EPKG_CONFLICT);
@@ -600,10 +597,9 @@ pkg_jobs_set_execute_priority(struct pkg_jobs *j, struct pkg_solved *solved)
			pkg_jobs_update_universe_priority(j->universe, solved->items[0],

					PKG_PRIORITY_UPDATE_DELETE);

	}
- 
	else {
- 
		if (solved->items[0]->priority == 0)
- 
			pkg_jobs_update_universe_priority(j->universe, solved->items[0],
- 
					PKG_PRIORITY_UPDATE_REQUEST);
+ 
	else if (solved->items[0]->priority == 0) {
+ 
		pkg_jobs_update_universe_priority(j->universe, solved->items[0],
+ 
				PKG_PRIORITY_UPDATE_REQUEST);

	}



	return (EPKG_OK);
modified libpkg/private/pkg_jobs.h
@@ -60,9 +60,8 @@ struct pkg_job_request {
};



struct pkg_solved {
- 
	struct pkg_job_universe_item *items[2];
+ 
	struct pkg_job_universe_item *items[2]; /* to-add/to-delete */

	pkg_solved_t type;
- 
	bool already_deleted;

	struct pkg_solved *prev, *next;

};