Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d435703
Set DEBUG_LEVEL to the highest specified value (conf or CLI).
Sean Chittenden committed 11 years ago
commit d435703c4fb73f28d3499ef68f47f4e136c6fde2
parent aa2d44a
1 file changed +4 -1
modified libpkg/pkg_config.c
@@ -744,6 +744,7 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
{

	struct ucl_parser *p = NULL;

	size_t i;
+ 
	int debug_level_cli, debug_level_ini;

	const char *val = NULL;

	const char *buf, *walk, *value, *key, *k;

	const char *evkey = NULL;
@@ -1018,7 +1019,9 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
	if (evpipe != NULL)

		connect_evpipe(evpipe);
- 
	debug_level = pkg_object_int(pkg_config_get("DEBUG_LEVEL"));
+ 
	debug_level_cli = debug_level;
+ 
	debug_level_ini = pkg_object_int(pkg_config_get("DEBUG_LEVEL"));
+ 
	debug_level = MAX(debug_level_cli, debug_level_ini);

	developer_mode = pkg_object_bool(pkg_config_get("DEVELOPER_MODE"));



	it = NULL;