986a841 Fix hang up in integrity check. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix hang up in integrity check.

Vsevolod Stakhov committed 11 years ago

commit 986a841f74c5bd8cfae6ec182aaa7eab2cbedf8f
parent 0befcf1

2 files changed +2 -2

modified libpkg/pkg_jobs.c

@@ -2161,7 +2161,6 @@ pkg_jobs_check_conflicts(struct pkg_jobs *j)

 			ret = res;
 		else
 			added ++;
 	}
 	pkg_debug(1, "check integrity for %d items added", added);

modified libpkg/pkg_jobs_conflicts.c

@@ -296,6 +296,7 @@ pkg_conflicts_register_chain(struct pkg_jobs *j, struct pkg_job_universe_item *u

 			if (p1->type == PKG_INSTALLED && p2->type == PKG_INSTALLED) {
 				/* Local and local packages cannot conflict */
 				cur2 = cur2->prev;
 				continue;
 			}
 			else if (p1->type == PKG_INSTALLED || p2->type == PKG_INSTALLED) {

@@ -426,7 +427,7 @@ pkg_conflicts_check_all_paths(struct pkg_jobs *j, const char *path,

 			 * Collision found, change the key following the
 			 * Cuckoo principle
 			 */
 			pkg_debug(2, "found a collision on path %s between %s and %s, key: %lu",
 			pkg_debug(1, "found a collision on path %s between %s and %s, key: %lu",
 				path, uid1, uid2, (unsigned long)k->k[0]);
 			k->k[0] ++;
 			return (pkg_conflicts_check_all_paths(j, path, it, k));