Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 638e51a
PKG_CONFIG_PERMISSIVE not PKG_PERMISSIVE internally
Baptiste Daroussin committed 13 years ago
commit 638e51a27f5f28c55e3164d5d606e0d8d06cc8a4
parent 02b5e9f
3 files changed +6 -3
modified libpkg/pkg.h
@@ -280,7 +280,7 @@ typedef enum _pkg_config_key {
	PKG_CONFIG_PLUGINS,

	PKG_CONFIG_DEBUG_SCRIPTS,

	PKG_CONFIG_PLUGINS_CONF_DIR,
- 
	PKG_PERMISSIVE,
+ 
	PKG_CONFIG_PERMISSIVE,

} pkg_config_key;



typedef enum {
modified libpkg/pkg_config.c
@@ -169,7 +169,7 @@ static struct config_entry c[] = {
		"PLUGINS_CONF_DIR",

		PREFIX"/etc/pkg/",

	},
- 
	[PKG_PERMISSIVE] = {
+ 
	[PKG_CONFIG_PERMISSIVE] = {

		PKG_CONFIG_BOOL,

		"PERMISSIVE",

		"NO",
modified libpkg/pkgdb.c
@@ -1996,6 +1996,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
		const char	*pkg_path = pkg_file_path(file);

		const char	*pkg_sum  = pkg_file_cksum(file);

		bool		permissive = false;
+ 
		bool		devmode = false;



		ret = run_prstmt(FILES, pkg_path, pkg_sum, package_id);

		if (ret == SQLITE_DONE)
@@ -2017,7 +2018,9 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
			goto cleanup;

		}

		pkg_get(pkg2, PKG_NAME, &name2, PKG_VERSION, &version2);
- 
		pkg_config_bool(PKG_PERMISSIVE, &permissive);
+ 
		pkg_config_bool(PKG_CONFIG_DEVELOPER_MODE, &devmode);
+ 
		if (!devmode)
+ 
			pkg_config_bool(PKG_CONFIG_PERMISSIVE, &permissive);

		pkg_emit_error("%s-%s conflicts with %s-%s"

		    " (installs files into the same place). "

		    " Problematic file: %s%s",