1 diff -ur poldek-0.42.2/cli/cmd_chain.c poldek-0.42.2-booldeps/cli/cmd_chain.c
2 --- poldek-0.42.2/cli/cmd_chain.c 2020-01-25 22:59:59.000000000 +0100
3 +++ poldek-0.42.2-booldeps/cli/cmd_chain.c 2022-05-19 16:33:21.159335140 +0200
7 #include "poldek_util.h"
8 -#define ENABLE_TRACE 0
11 #include "cmd_chain.h"
12 diff -ur poldek-0.42.2/conf.c poldek-0.42.2-booldeps/conf.c
13 --- poldek-0.42.2/conf.c 2020-03-10 11:19:28.000000000 +0100
14 +++ poldek-0.42.2-booldeps/conf.c 2022-05-19 16:32:35.185649828 +0200
16 #include <trurl/nstream.h>
17 #include <vfile/vfile.h>
19 -#define ENABLE_TRACE 0
23 diff -ur poldek-0.42.2/depdirs.c poldek-0.42.2-booldeps/depdirs.c
24 --- poldek-0.42.2/depdirs.c 2020-01-25 22:59:59.000000000 +0100
25 +++ poldek-0.42.2-booldeps/depdirs.c 2022-05-19 16:32:32.922297335 +0200
27 #include <trurl/nassert.h>
28 #include <trurl/nmalloc.h>
30 -#define ENABLE_TRACE 0
34 diff -ur poldek-0.42.2/install3/ictx.h poldek-0.42.2-booldeps/install3/ictx.h
35 --- poldek-0.42.2/install3/ictx.h 2020-04-04 21:01:09.000000000 +0200
36 +++ poldek-0.42.2-booldeps/install3/ictx.h 2022-05-19 16:32:43.675720130 +0200
38 #include <trurl/trurl.h>
39 #include <sigint/sigint.h>
41 -#define ENABLE_TRACE 0
45 diff -ur poldek-0.42.2/install3/iset.c poldek-0.42.2-booldeps/install3/iset.c
46 --- poldek-0.42.2/install3/iset.c 2020-01-25 22:59:59.000000000 +0100
47 +++ poldek-0.42.2-booldeps/install3/iset.c 2022-05-19 16:32:41.449035264 +0200
52 -#define ENABLE_TRACE 0
56 #include <sys/param.h> /* for PATH_MAX */
57 diff -ur poldek-0.42.2/pkg.c poldek-0.42.2-booldeps/pkg.c
58 --- poldek-0.42.2/pkg.c 2022-05-20 16:21:07.639370807 +0200
59 +++ poldek-0.42.2-booldeps/pkg.c 2022-05-19 16:49:06.084231070 +0200
61 #include <trurl/nstr.h>
62 #include <trurl/nassert.h>
64 -#define ENABLE_TRACE 0
71 if (cap_xmatch_req(cap, req, flags)) {
72 - DBGF(" cap[%d] %s -> match\n", i, capreq_snprintf_s(cap));
73 + DBGF(" cap[%d] %s -> match (pkg: %s)\n", i, capreq_snprintf_s(cap), pkg->name);
77 diff -ur poldek-0.42.2/pkgcmp.c poldek-0.42.2-booldeps/pkgcmp.c
78 --- poldek-0.42.2/pkgcmp.c 2020-03-16 14:27:06.000000000 +0100
79 +++ poldek-0.42.2-booldeps/pkgcmp.c 2022-05-19 16:34:31.123077977 +0200
81 #include <trurl/nstr.h>
82 #include <trurl/nassert.h>
84 -#define ENABLE_TRACE 0
91 if (pkg_cmp_name_evr_rev(p1, p2) == 0)
92 - logn(LOGNOTICE, "uniq %s: keep %s (score %d), removed %s (score %d)",
93 + logn(LOGNOTICE, "uniq %s: keep %s (score %d), removed %s",
94 pkg_snprintf_s(p1), pkg_arch(p1), pkg_arch_score(p1),
95 - pkg_arch(p2), pkg_archscore(p2));
98 rc = pkg_cmp_name_evr_rev(p1, p2);
100 diff -ur poldek-0.42.2/pkgdir/pkgdir.c poldek-0.42.2-booldeps/pkgdir/pkgdir.c
101 --- poldek-0.42.2/pkgdir/pkgdir.c 2020-03-26 10:22:47.000000000 +0100
102 +++ poldek-0.42.2-booldeps/pkgdir/pkgdir.c 2022-05-19 16:33:01.562526953 +0200
105 #include <vfile/vfile.h>
107 -#define ENABLE_TRACE 0
108 #include "compiler.h"
111 diff -ur poldek-0.42.2/pkgdir/source.c poldek-0.42.2-booldeps/pkgdir/source.c
112 --- poldek-0.42.2/pkgdir/source.c 2020-03-16 15:23:52.000000000 +0100
113 +++ poldek-0.42.2-booldeps/pkgdir/source.c 2022-05-19 16:32:57.605830198 +0200
116 #include <vfile/vfile.h>
118 -#define ENABLE_TRACE 0
120 #include "compiler.h"
122 #include "pkgdir_intern.h"
123 diff -ur poldek-0.42.2/pkgdir/source_mkidx.c poldek-0.42.2-booldeps/pkgdir/source_mkidx.c
124 --- poldek-0.42.2/pkgdir/source_mkidx.c 2020-03-25 21:14:48.000000000 +0100
125 +++ poldek-0.42.2-booldeps/pkgdir/source_mkidx.c 2022-05-19 16:32:55.049143819 +0200
128 #include <vfile/vfile.h>
130 -#define ENABLE_TRACE 0
132 #include "compiler.h"
134 #include "pkgdir_intern.h"
135 diff -ur poldek-0.42.2/pkgiter.c poldek-0.42.2-booldeps/pkgiter.c
136 --- poldek-0.42.2/pkgiter.c 2020-04-04 21:01:09.000000000 +0200
137 +++ poldek-0.42.2-booldeps/pkgiter.c 2022-05-19 16:33:05.289221486 +0200
139 #include <trurl/nstr.h>
140 #include <trurl/nassert.h>
142 -#define ENABLE_TRACE 0
143 #include "compiler.h"
146 diff -ur poldek-0.42.2/pkgroup.c poldek-0.42.2-booldeps/pkgroup.c
147 --- poldek-0.42.2/pkgroup.c 2020-01-25 22:59:59.000000000 +0100
148 +++ poldek-0.42.2-booldeps/pkgroup.c 2022-05-19 16:33:19.022653641 +0200
151 #include <trurl/trurl.h>
153 -#define ENABLE_TRACE 0
155 #include "compiler.h"
158 diff -ur poldek-0.42.2/pm/pkgdb.c poldek-0.42.2-booldeps/pm/pkgdb.c
159 --- poldek-0.42.2/pm/pkgdb.c 2020-04-05 21:03:29.000000000 +0200
160 +++ poldek-0.42.2-booldeps/pm/pkgdb.c 2022-05-19 18:03:20.192624394 +0200
165 + DBGF("header_cap_match_req\n");
167 memset(&pkg, 0, sizeof(pkg));
168 pkg.caps = capreq_arr_new(0);
172 is_file = (*capreq_name(req) == '/' ? 1 : 0);
173 - //tracef(0, "%s %d", capreq_snprintf_s(req), n_array_size(exclude));
174 + tracef(0, "%s %d", capreq_snprintf_s(req), n_array_size(exclude));
176 if (!is_file && db_match(db, PMTAG_NAME, req, exclude, ma_flags))
178 diff -ur poldek-0.42.2/pm/rpm/rpmdb_it.c poldek-0.42.2-booldeps/pm/rpm/rpmdb_it.c
179 --- poldek-0.42.2/pm/rpm/rpmdb_it.c 2020-01-25 22:59:59.000000000 +0100
180 +++ poldek-0.42.2-booldeps/pm/rpm/rpmdb_it.c 2022-05-19 16:32:46.145740124 +0200
185 -#define ENABLE_TRACE 0
189 diff -ur poldek-0.42.2/pm/rpmorg/rpmdb_it.c poldek-0.42.2-booldeps/pm/rpmorg/rpmdb_it.c
190 --- poldek-0.42.2/pm/rpmorg/rpmdb_it.c 2020-01-25 22:59:59.000000000 +0100
191 +++ poldek-0.42.2-booldeps/pm/rpmorg/rpmdb_it.c 2022-05-19 16:32:49.022429816 +0200
196 -#define ENABLE_TRACE 0
200 diff -ur poldek-0.42.2/pm/rpmorg/rpm_pkg_ld.c poldek-0.42.2-booldeps/pm/rpmorg/rpm_pkg_ld.c
201 --- poldek-0.42.2/pm/rpmorg/rpm_pkg_ld.c 2022-05-20 16:21:07.646037483 +0200
202 +++ poldek-0.42.2-booldeps/pm/rpmorg/rpm_pkg_ld.c 2022-05-20 15:27:51.747648780 +0200
203 @@ -218,10 +218,10 @@
207 - msg(5, "%s%s: %s\n",
208 + DBGF("%s%s: %s, %s\n",
209 cr->cr_flags & CAPREQ_PREREQ ?
210 (pmcap_tag == PMCAP_OBSL ? "obsl" : "pre" ):"",
211 - tgs->label, capreq_snprintf_s(cr));
212 + tgs->label, capreq_snprintf_s(cr), name);
213 n_array_push(arr, cr);
216 diff -ur poldek-0.42.2/tndb/write.c poldek-0.42.2-booldeps/tndb/write.c
217 --- poldek-0.42.2/tndb/write.c 2020-01-25 23:27:30.000000000 +0100
218 +++ poldek-0.42.2-booldeps/tndb/write.c 2022-05-19 16:33:15.672630089 +0200
220 #include <trurl/narray.h>
221 #include <trurl/nassert.h>
223 -#define ENABLE_TRACE 0
224 #include "compiler.h"
225 #include "tndb_int.h"
227 diff -ur poldek-0.42.2/uninstall.c poldek-0.42.2-booldeps/uninstall.c
228 --- poldek-0.42.2/uninstall.c 2020-01-25 22:59:59.000000000 +0100
229 +++ poldek-0.42.2-booldeps/uninstall.c 2022-05-19 16:32:52.129121034 +0200
231 #include <trurl/trurl.h>
233 #include "sigint/sigint.h"
234 -#define ENABLE_TRACE 0
235 #include "compiler.h"
238 diff -ur poldek-0.42.2/upgrade-dist.c poldek-0.42.2-booldeps/upgrade-dist.c
239 --- poldek-0.42.2/upgrade-dist.c 2020-01-25 22:59:59.000000000 +0100
240 +++ poldek-0.42.2-booldeps/upgrade-dist.c 2022-05-19 16:33:23.476017725 +0200
243 #include <sigint/sigint.h>
245 -#define ENABLE_TRACE 0
246 #include "compiler.h"
249 diff -ur poldek-0.42.2/vfile/vopen3.c poldek-0.42.2-booldeps/vfile/vopen3.c
250 --- poldek-0.42.2/vfile/vopen3.c 2020-01-25 22:59:59.000000000 +0100
251 +++ poldek-0.42.2-booldeps/vfile/vopen3.c 2022-05-19 16:32:37.749004646 +0200
254 #include <trurl/nassert.h>
255 #include <trurl/nmalloc.h>
256 -#define ENABLE_TRACE 0
257 #include "compiler.h"
259 #include "log.h" /* for DBGF */