1a2f275 Another try to fix local packages duplicates — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Another try to fix local packages duplicates

Vsevolod Stakhov committed 9 years ago

commit 1a2f275a5c01fbdc84cbca8884fb0d809566c377
parent 58aa8f1

1 file changed +4 -1

modified libpkg/pkg_jobs_universe.c

@@ -184,7 +184,7 @@ pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,

 			}
 			LL_FOREACH (seen, tmp) {
 				if (tmp->pkg->type != PKG_INSTALLED && tmp->pkg->reponame) {
 				if (tmp->pkg->reponame) {
 					if (strcmp (pkg->reponame, tmp->pkg->reponame) == 0) {
 						/* Same repo package in the chain, do not add */
 						other_candidate = false;

@@ -202,6 +202,9 @@ pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,

 			return (EPKG_END);
 		}
 	}
 	else if (seen && !force) {
 		return (EPKG_END);
 	}
 	if (pkg_is_locked(pkg)) {
 		pkg_emit_locked(pkg);