a884e2f Fix same repo policy — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix same repo policy

Vsevolod Stakhov committed 9 years ago

commit a884e2f455607378682fc7c7350b68458cbfd691
parent 6cfc831

2 files changed +3 -8

modified libpkg/pkg_jobs.c

@@ -734,7 +734,8 @@ new_pkg_version(struct pkg_jobs *j)

 					/* We really have newer version which is not installed */
 					/* Preserve repo pinning logic */
 					if ((j->reponame && strcmp (cit->pkg->reponame, j->reponame) == 0) ||
 							(!j->reponame && strcmp (cit->pkg->reponame, p->reponame) == 0)) {
 							(!j->reponame && p->reponame &&
 									strcmp (cit->pkg->reponame, p->reponame) == 0)) {
 						ret = true;
 					}
 				}

modified libpkg/pkg_jobs_universe.c

@@ -983,13 +983,7 @@ pkg_jobs_universe_select_same_repo(struct pkg_job_universe_item *chain,

 	}
 	if (local_repo == NULL) {
 		/* Return any package */
 		LL_FOREACH(chain, cur) {
 			if (cur->pkg->type == PKG_INSTALLED)
 				continue;
 			else
 				return (cur);
 		}
 		return (NULL);
 	}
 	else {
 		LL_FOREACH(chain, cur) {