Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 0eb3180
Take local require/provide into consideration.
Vsevolod Stakhov committed 11 years ago
commit 0eb31804a063fe58f3522274bc45e1464cc70c74
parent 28bc3c8
1 file changed +9 -12
modified libpkg/pkg_solve.c
@@ -709,19 +709,16 @@ pkg_solve_process_universe_variable(struct pkg_solve_problem *problem,


		/* Shlibs */

		shlib = NULL;
- 
		if (pkg->type != PKG_INSTALLED) {
- 
			while (pkg_shlibs_required(pkg, &shlib) == EPKG_OK) {
- 
				if (pkg_solve_add_require_rule(problem, cur_var,
- 
				    shlib->name) != EPKG_OK)
- 
					continue;
- 
			}
+ 
		while (pkg_shlibs_required(pkg, &shlib) == EPKG_OK) {
+ 
			if (pkg_solve_add_require_rule(problem, cur_var,
+ 
					shlib->name) != EPKG_OK)
+ 
				continue;

		}
- 
		if (pkg->type != PKG_INSTALLED) {
- 
			while (pkg_requires(pkg, &p) == EPKG_OK) {
- 
				if (pkg_solve_add_require_rule(problem, cur_var,
- 
				    p->provide) != EPKG_OK)
- 
					continue;
- 
			}
+ 
		p = NULL;
+ 
		while (pkg_requires(pkg, &p) == EPKG_OK) {
+ 
			if (pkg_solve_add_require_rule(problem, cur_var,
+ 
					p->provide) != EPKG_OK)
+ 
				continue;

		}



		/* Request */