a666f4c pkg-(add|install|upgrade): Respect locked packages on forced invocation. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg-(add|install|upgrade): Respect locked packages on forced invocation.

Michael Gmelin committed 11 years ago

commit a666f4c3263da712491238f64c8e40f3b6d445cd
parent 989447d

1 file changed +8 -1

modified libpkg/pkg_jobs_universe.c

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

 			vercnt ++;
 		}
 		if (vercnt > 1) {
 		if (local != NULL && pkg_is_locked(local->pkg)) {
 			LL_FOREACH(unit, cur) {
 				HASH_FIND_PTR(j->request_add, &cur, req);
 				if (req != NULL)
 					HASH_DEL(j->request_add, req);
 			}
 		}
 		else if (vercnt > 1) {
 			/*
 			 * Here we have more than one upgrade candidate,
 			 * if local == NULL, then we have two remote repos,