2200f40 Use context variable to determine the status of developer_mode — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Use context variable to determine the status of developer_mode

Baptiste Daroussin committed 6 years ago

commit 2200f40beb26929633c513cc618eb4527a169899
parent 7db52cf

3 files changed +5 -7

modified libpkg/pkg_add.c

@@ -968,11 +968,11 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag

 			ret = pkg_script_run(old, PKG_SCRIPT_PRE_UPGRADE);
 		else
 			ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL);
 		if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) {
 		if (ret != EPKG_OK && ctx.developer_mode) {
 			return (ret);
 		} else {
 			ret = pkg_lua_script_run(old, PKG_LUA_PRE_DEINSTALL);
 			if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) {
 			if (ret != EPKG_OK && ctx.developer_mode) {
 				return (ret);
 			} else {
 				ret = EPKG_OK;

modified libpkg/pkg_delete.c

@@ -96,11 +96,11 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)

 				return (ret);
 		} else {
 			ret = pkg_script_run(pkg, PKG_SCRIPT_PRE_DEINSTALL);
 			if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE")))
 			if (ret != EPKG_OK && ctx.developer_mode)
 				return (ret);
 		}
 		ret = pkg_lua_script_run(pkg, PKG_LUA_PRE_DEINSTALL);
 		if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE")))
 		if (ret != EPKG_OK && ctx.developer_mode)
 			return (ret);
 	}

modified libpkg/pkgdb.c

@@ -1794,7 +1794,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int forced)

 	while (pkg_files(pkg, &file) == EPKG_OK) {
 		bool		permissive = false;
 		bool		devmode = false;
 		ret = run_prstmt(FILES, file->path, file->sum, package_id);
 		if (ret == SQLITE_DONE)

@@ -1829,8 +1828,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int forced)

 			goto cleanup;
 		}
 		if (!forced) {
 			devmode = pkg_object_bool(pkg_config_get("DEVELOPER_MODE"));
 			if (!devmode)
 			if (!ctx.developer_mode)
 				permissive = pkg_object_bool(pkg_config_get("PERMISSIVE"));
 			pkg_emit_error("%s-%s conflicts with %s-%s"
 			    " (installs files into the same place). "