36a7446 Unlink all unrelated candidates from the request. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Unlink all unrelated candidates from the request.

Vsevolod Stakhov committed 11 years ago

commit 36a74460a56a16412ef3b59b3057b822e22b21e2
parent 8a0408c

1 file changed +2 -3

modified libpkg/pkg_jobs_universe.c

@@ -805,7 +805,7 @@ pkg_jobs_universe_process_upgrade_chains(struct pkg_jobs *j)

 {
 	struct pkg_job_universe_item *unit, *tmp, *cur, *local;
 	struct pkg_job_request *req;
 	struct pkg_job_request_item *rit;
 	struct pkg_job_request_item *rit, *rtmp;
 	HASH_ITER(hh, j->universe->items, unit, tmp) {
 		unsigned vercnt = 0;

@@ -859,11 +859,10 @@ pkg_jobs_universe_process_upgrade_chains(struct pkg_jobs *j)

 				assert(selected != NULL);
 				LL_FOREACH(unit, cur) {
 					if (cur != selected) {
 						DL_FOREACH(req->item, rit) {
 						DL_FOREACH_SAFE(req->item, rit, rtmp) {
 							if (rit->unit == cur) {
 								DL_DELETE(req->item, rit);
 								free(rit);
 								break;
 							}
 						}
 					}