Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7978b52
Restore respecting flags on deletion
Baptiste Daroussin committed 12 years ago
commit 7978b5234bad079b8bb1285cc2dd1c6abc58bda6
parent bc91fa4
1 file changed +8 -1
modified libpkg/pkg_jobs.c
@@ -1682,6 +1682,12 @@ pkg_jobs_execute(struct pkg_jobs *j)
	if (j->flags & PKG_FLAG_SKIP_INSTALL)

		return (EPKG_OK);
+ 
	if ((j->flags & PKG_FLAG_FORCE) == PKG_FLAG_FORCE)
+ 
		flags |= PKG_DELETE_FORCE;
+
+ 
	if ((j->flags & PKG_FLAG_NOSCRIPT) == PKG_FLAG_NOSCRIPT)
+ 
		flags |= PKG_DELETE_NOSCRIPT;
+ 


	cachedir = pkg_object_string(pkg_config_get("PKG_CACHEDIR"));

	handle_rc = pkg_object_bool(pkg_config_get("HANDLE_RC_SCRIPTS"));
@@ -1705,7 +1711,8 @@ pkg_jobs_execute(struct pkg_jobs *j)
			p = ps->items[0]->pkg;

			pkg_get(p, PKG_NAME, &name);

			if ((strcmp(name, "pkg") == 0 ||
- 
				strcmp(name, "pkg-devel") == 0) && flags != PKG_DELETE_FORCE) {
+ 
			    strcmp(name, "pkg-devel") == 0) &&
+ 
			    (flags & PKG_DELETE_FORCE) == 0) {

				pkg_emit_error("Cannot delete pkg itself without force flag");

				continue;

			}