Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 1928573
Fixed forced operations.
Vsevolod Stakhov committed 11 years ago
commit 192857334c33ce0aae1710fb083e657c4be3c464
parent 49fcc40
1 file changed +3 -2
modified libpkg/pkg_jobs_universe.c
@@ -432,7 +432,7 @@ pkg_jobs_universe_process_item(struct pkg_jobs_universe *universe, struct pkg *p
	job_flags = universe->j->flags;



	/* Add pkg itself */
- 
	rc = pkg_jobs_universe_add_pkg(universe, pkg, false,
+ 
	rc = pkg_jobs_universe_add_pkg(universe, pkg, job_flags & PKG_FLAG_FORCE,

		result);

	if (rc == EPKG_END)

		return (EPKG_OK);
@@ -479,7 +479,8 @@ pkg_jobs_universe_process_item(struct pkg_jobs_universe *universe, struct pkg *p
	case PKG_JOBS_AUTOREMOVE:

		/* For delete jobs we worry only about local reverse deps */

		flags |= DEPS_FLAG_REVERSE|DEPS_FLAG_FORCE_LOCAL;
- 
		rc = pkg_jobs_universe_process_deps(universe, pkg, flags);
+ 
		if (!(job_flags & PKG_FLAG_FORCE))
+ 
			rc = pkg_jobs_universe_process_deps(universe, pkg, flags);

		break;

	}