Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 965bc5f
autoremove: process shlibs, provides/requires and dependencies in the solver
Baptiste Daroussin committed 3 years ago
commit 965bc5f9b441e0c4661fb7d407ea75271e9ffb6b
parent 5513240
1 file changed +21 -1
modified libpkg/pkg_jobs_universe.c
@@ -614,13 +614,33 @@ pkg_jobs_universe_process_item(struct pkg_jobs_universe *universe, struct pkg *p
			return (rc);

		break;

	case PKG_JOBS_AUTOREMOVE:
+ 
		rc = pkg_jobs_universe_process_deps(universe, pkg, flags);
+ 
		if (rc != EPKG_OK)
+ 
			return (rc);
+ 
		rc = pkg_jobs_universe_process_shlibs(universe, pkg);
+ 
		if (rc != EPKG_OK)
+ 
			return (rc);
+ 
		rc = pkg_jobs_universe_process_provides_requires(universe, pkg);
+ 
		if (rc != EPKG_OK)
+ 
			return (rc);
+ 
		break;

		/* XXX */

		break;

	case PKG_JOBS_DEINSTALL:

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

		flags |= DEPS_FLAG_REVERSE|DEPS_FLAG_FORCE_LOCAL;
- 
		if (job_flags & PKG_FLAG_RECURSIVE)
+ 
		if (job_flags & PKG_FLAG_RECURSIVE) {

			rc = pkg_jobs_universe_process_deps(universe, pkg, flags);
+ 
			if (rc != EPKG_OK)
+ 
				return (rc);
+ 
			rc = pkg_jobs_universe_process_shlibs(universe, pkg);
+ 
			if (rc != EPKG_OK)
+ 
				return (rc);
+ 
			rc = pkg_jobs_universe_process_provides_requires(universe, pkg);
+ 
			if (rc != EPKG_OK)
+ 
				return (rc);
+ 
			break;
+ 
		}

		break;

	}