Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2bb7306
debug: add a "config" debug flag
Baptiste Daroussin committed 2 years ago
commit 2bb7306eed29d57c39ff590906676214856de6a8
parent 6cccc24
2 files changed +13 -11
modified libpkg/pkg_config.c
@@ -619,7 +619,7 @@ add_repo(const ucl_object_t *obj, struct pkg_repo *r, const char *rname, pkg_ini
	int use_ipvx = 0;

	int priority = 0;
- 
	pkg_debug(1, "PkgConfig: parsing repository object %s", rname);
+ 
	pkg_dbg(PKG_DBG_CONFIG, "parsing repository object %s", rname);



	env = NULL;

	enabled = ucl_object_find_key(obj, "enabled");
@@ -632,7 +632,7 @@ add_repo(const ucl_object_t *obj, struct pkg_repo *r, const char *rname, pkg_ini
			 * We basically want to remove the existing repo r and

			 * forget all stuff parsed

			 */
- 
			pkg_debug(1, "PkgConfig: disabling repo %s", rname);
+ 
			pkg_dbg(PKG_DBG_CONFIG,"PkgConfig: disabling repo %s", rname);

			DL_DELETE(repos, r);

			pkg_repo_free(r);

			return;
@@ -721,7 +721,7 @@ add_repo(const ucl_object_t *obj, struct pkg_repo *r, const char *rname, pkg_ini
	}



	if (r == NULL && url == NULL) {
- 
		pkg_debug(1, "No repo and no url for %s", rname);
+ 
		pkg_dbg(PKG_DBG_CONFIG,"No repo and no url for %s", rname);

		return;

	}
@@ -792,10 +792,10 @@ add_repo_obj(const ucl_object_t *obj, const char *file, pkg_init_flags flags)
	const char *key;



	key = ucl_object_key(obj);
- 
	pkg_debug(1, "PkgConfig: parsing repo key '%s' in file '%s'", key, file);
+ 
	pkg_dbg(PKG_DBG_CONFIG,"PkgConfig: parsing repo key '%s' in file '%s'", key, file);

	r = pkg_repo_find(key);

	if (r != NULL)
- 
		pkg_debug(1, "PkgConfig: overwriting repository %s", key);
+ 
		pkg_dbg(PKG_DBG_CONFIG,"PkgConfig: overwriting repository %s", key);

       add_repo(obj, r, key, flags);

}
@@ -810,10 +810,10 @@ walk_repo_obj(const ucl_object_t *obj, const char *file, pkg_init_flags flags)


	while ((cur = ucl_iterate_object(obj, &it, true))) {

		key = ucl_object_key(cur);
- 
		pkg_debug(1, "PkgConfig: parsing key '%s'", key);
+ 
		pkg_dbg(PKG_DBG_CONFIG,"PkgConfig: parsing key '%s'", key);

		r = pkg_repo_find(key);

		if (r != NULL)
- 
			pkg_debug(1, "PkgConfig: overwriting repository %s", key);
+ 
			pkg_dbg(PKG_DBG_CONFIG,"PkgConfig: overwriting repository %s", key);

		if (cur->type == UCL_OBJECT)

			add_repo(cur, r, key, flags);

		else {
@@ -864,7 +864,7 @@ load_repo_file(int dfd, const char *repodir, const char *repofile,
	errno = 0;

	obj = NULL;
- 
	pkg_debug(1, "PKgConfig: loading %s/%s", repodir, repofile);
+ 
	pkg_dbg(PKG_DBG_CONFIG,"PKgConfig: loading %s/%s", repodir, repofile);

	fd = openat(dfd, repofile, O_RDONLY);

	if (fd == -1) {

		pkg_errno("Unable to open '%s/%s'", repodir, repofile);
@@ -917,7 +917,7 @@ load_repo_files(const char *repodir, pkg_init_flags flags, struct os_info *oi)
	struct dirent **ent;

	int nents, i, fd;
- 
	pkg_debug(1, "PkgConfig: loading repositories in %s", repodir);
+ 
	pkg_dbg(PKG_DBG_CONFIG,"PkgConfig: loading repositories in %s", repodir);

	if ((fd = open(repodir, O_DIRECTORY|O_CLOEXEC)) == -1)

		return;
@@ -1374,7 +1374,7 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
		goto out;

	}
- 
	pkg_debug(1, "%s", "pkg initialized");
+ 
	pkg_dbg(PKG_DBG_CONFIG,"%s", "pkg initialized");



#ifdef __FreeBSD__

	ctx.osversion = pkg_object_int(pkg_config_get("OSVERSION"));
@@ -1404,7 +1404,7 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
	object = ucl_object_find_key(config, "PKG_ENV");

	while ((cur = ucl_iterate_object(object, &it, true))) {

		evkey = ucl_object_key(cur);
- 
		pkg_debug(1, "Setting env var: %s", evkey);
+ 
		pkg_dbg(PKG_DBG_CONFIG,"Setting env var: %s", evkey);

		if (evkey != NULL && evkey[0] != '\0')

			setenv(evkey, ucl_object_tostring_forced(cur), 1);

	}
modified libpkg/private/event.h
@@ -53,6 +53,7 @@ void pkg_emit_pkg_errno(pkg_error_t err, const char *func, const char *arg);
typedef enum {

	PKG_DBG_NONE = (1UL << 0),

	PKG_DBG_FETCH = (1UL << 1),
+ 
	PKG_DBG_CONFIG = (1UL << 2),

	PKG_DBG_ALL = (1UL << 63),

} pkg_debug_flags;
@@ -64,6 +65,7 @@ struct pkg_dbg_flags {
static const struct pkg_dbg_flags debug_flags[] = {

	{ PKG_DBG_NONE, "none" },

	{ PKG_DBG_FETCH, "fetch" },
+ 
	{ PKG_DBG_CONFIG, "config" },

	{ PKG_DBG_ALL, "all" },

};