e881083 debug: add a database namespace — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

debug: add a database namespace

Baptiste Daroussin committed 1 year ago

commit e8810830779fa94c81326c6bcecc53b654cad375
parent da29c15

2 files changed +8 -4

modified libpkg/pkgdb_iterator.c

@@ -38,6 +38,8 @@

 #include "pkg_config.h"
 #endif
 #define dbg(x, ...) pkg_dbg(PKG_DBG_DATABASE, x, __VA_ARGS__)
 #include <assert.h>
 #include <errno.h>
 #include <regex.h>

@@ -276,7 +278,7 @@ pkgdb_load_deps(sqlite3 *sqlite, struct pkg *pkg)

 	sqlite3_finalize(stmt);
 	if (pkg->dep_formula) {
 		pkg_debug(4, "Pkgdb: reading package formula '%s'", pkg->dep_formula);
 		dbg(4, "Pkgdb: reading package formula '%s'", pkg->dep_formula);
 		f = pkg_deps_parse_formula (pkg->dep_formula);

@@ -322,7 +324,7 @@ pkgdb_load_deps(sqlite3 *sqlite, struct pkg *pkg)

 									if(STREQ(optit->opt, sqlite3_column_text(opt_stmt, 0))) {
 										if ((!STREQ(sqlite3_column_text(opt_stmt, 1), "on") && !optit->on)
 											|| (!STREQ(sqlite3_column_text(opt_stmt, 1), "off") && optit->on)) {
 											pkg_debug(4, "incompatible option for"
 											dbg(4, "incompatible option for"
 													"%s: %s",
 													sqlite3_column_text(opt_stmt, 1),
 													optit->opt);

@@ -768,7 +770,7 @@ pkgdb_load_options(sqlite3 *sqlite, struct pkg *pkg)

 		opt_sql       = optionsql[i].sql;
 		pkg_addtagval = optionsql[i].pkg_addtagval;
 		pkg_debug(4, "Pkgdb> adding option");
 		dbg(4, "adding option");
 		ret = load_tag_val(sqlite, pkg, opt_sql, PKG_LOAD_OPTIONS,
 				   pkg_addtagval, PKG_OPTIONS);
 		if (ret != EPKG_OK)

modified libpkg/private/event.h

@@ -62,7 +62,8 @@ typedef enum {

 	PKG_DBG_SOLVER = (1UL << 6),
 	PKG_DBG_JOBS = (1UL << 7),
 	PKG_DBG_UNIVERSE = (1UL << 8),
 	PKG_DBG_PACKAGE = (1UL << 8),
 	PKG_DBG_PACKAGE = (1UL << 9),
 	PKG_DBG_DATABASE = (1UL << 10),
 	PKG_DBG_ALL = (1UL << 63),
 } pkg_debug_flags;

@@ -82,6 +83,7 @@ static const struct pkg_dbg_flags debug_flags[] = {

 	{ PKG_DBG_JOBS, "jobs"},
 	{ PKG_DBG_UNIVERSE, "universe" },
 	{ PKG_DBG_PACKAGE, "package" },
 	{ PKG_DBG_DATABASE, "db" },
 	{ PKG_DBG_ALL, "all" },
 };