Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 175b2a2
Do not fail if we cannot check not fetched package.
Vsevolod Stakhov committed 11 years ago
commit 175b2a2119dfb46035890e48b2352162ff25f7d5
parent 58c4263
1 file changed +12 -2
modified libpkg/pkg_jobs_conflicts.c
@@ -207,8 +207,18 @@ pkg_conflicts_need_conflict(struct pkg_jobs *j, struct pkg *p1, struct pkg *p2)
	struct pkg_dir *df;

	struct pkg_conflict *c;
- 
	assert(pkgdb_ensure_loaded(j->db, p1, PKG_LOAD_FILES|PKG_LOAD_DIRS) == EPKG_OK);
- 
	assert(pkgdb_ensure_loaded(j->db, p2, PKG_LOAD_FILES|PKG_LOAD_DIRS) == EPKG_OK);
+ 
	if (pkgdb_ensure_loaded(j->db, p1, PKG_LOAD_FILES|PKG_LOAD_DIRS) != EPKG_OK ||
+ 
			pkgdb_ensure_loaded(j->db, p2, PKG_LOAD_FILES|PKG_LOAD_DIRS)
+ 
						!= EPKG_OK) {
+ 
		/*
+ 
		 * If some of packages are not loaded we could silently and safely
+ 
		 * ignore them
+ 
		 */
+ 
		pkg_debug(1, "cannot load files from %s and %s to check conflicts",
+ 
			p1->name, p2->name);
+
+ 
		return (false);
+ 
	}



	/*

	 * Check if we already have this conflict registered