8b43503 Fix integrity check for multirepos. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix integrity check for multirepos.

Vsevolod Stakhov committed 11 years ago

commit 8b43503e58a6fbd772850ed7a5ad8f61b8d184dc
parent 33057c8

1 file changed +9 -4

modified libpkg/pkg_jobs_conflicts.c

@@ -512,12 +512,17 @@ pkg_conflicts_append_chain(struct pkg_job_universe_item *it,

 		if (cur != lp) {
 			if (pkgdb_ensure_loaded(j->db, cur->pkg, PKG_LOAD_FILES|PKG_LOAD_DIRS)
 							!= EPKG_OK) {
 				pkg_emit_error("cannot load files from %s to check integrity",
 				/*
 				 * This means that a package was not downloaded, so we can safely
 				 * ignore this conflict, since we are not going to install it
 				 * anyway
 				 */
 				pkg_debug (3, "cannot load files from %s to check integrity",
 					cur->pkg->name);
 				return (EPKG_FATAL);
 			}
 			pkg_conflicts_check_chain_conflict(cur, lp, j);
 			else {
 				pkg_conflicts_check_chain_conflict(cur, lp, j);
 			}
 		}
 		cur = cur->prev;