more-trace.patch

   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
   4 @@ -29,7 +29,6 @@
   5  #include "compiler.h"
   6  #include "i18n.h"
   7  #include "poldek_util.h"
   8 -#define ENABLE_TRACE 0
   9  #include "log.h"
  10  #include "cli.h"
  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
  15 @@ -34,7 +34,6 @@
  16  #include <trurl/nstream.h>
  17  #include <vfile/vfile.h>
  18
  19 -#define ENABLE_TRACE 0
  20  #include "compiler.h"
  21  #include "i18n.h"
  22  #include "log.h"
  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
  26 @@ -22,7 +22,6 @@
  27  #include <trurl/nassert.h>
  28  #include <trurl/nmalloc.h>
  29
  30 -#define ENABLE_TRACE 0
  31  #include "compiler.h"
  32  #include "log.h"
  33  #include "i18n.h"
  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
  37 @@ -17,7 +17,6 @@
  38  #include <trurl/trurl.h>
  39  #include <sigint/sigint.h>
  40
  41 -#define ENABLE_TRACE 0
  42  #include "i18n.h"
  43  #include "log.h"
  44  #include "misc.h"
  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
  48 @@ -14,8 +14,6 @@
  49  # include "config.h"
  50  #endif
  51
  52 -#define ENABLE_TRACE 0
  53 -
  54  #include <stdlib.h>
  55  #include <string.h>
  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
  60 @@ -27,7 +27,6 @@
  61  #include <trurl/nstr.h>
  62  #include <trurl/nassert.h>
  63
  64 -#define ENABLE_TRACE 0
  65  #include "compiler.h"
  66  #include "i18n.h"
  67  #include "log.h"
  68 @@ -683,7 +682,7 @@
  69              }
  70
  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);
  74                  return 1;
  75              }
  76
  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
  80 @@ -22,7 +22,6 @@
  81  #include <trurl/nstr.h>
  82  #include <trurl/nassert.h>
  83
  84 -#define ENABLE_TRACE 0
  85  #include "compiler.h"
  86  #include "i18n.h"
  87  #include "log.h"
  88 @@ -360,9 +359,9 @@
  89
  90  #if ENABLE_TRACE
  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));
  96 +             pkg_arch(p2));
  97  #endif
  98      rc = pkg_cmp_name_evr_rev(p1, p2);
  99
 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
 103 @@ -35,7 +35,6 @@
 104
 105  #include <vfile/vfile.h>
 106
 107 -#define ENABLE_TRACE 0
 108  #include "compiler.h"
 109  #include "i18n.h"
 110  #include "log.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
 114 @@ -29,8 +29,6 @@
 115
 116  #include <vfile/vfile.h>
 117
 118 -#define ENABLE_TRACE 0
 119 -
 120  #include "compiler.h"
 121  #include "pkgdir.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
 126 @@ -29,8 +29,6 @@
 127
 128  #include <vfile/vfile.h>
 129
 130 -#define ENABLE_TRACE 0
 131 -
 132  #include "compiler.h"
 133  #include "pkgdir.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
 138 @@ -24,7 +24,6 @@
 139  #include <trurl/nstr.h>
 140  #include <trurl/nassert.h>
 141
 142 -#define ENABLE_TRACE 0
 143  #include "compiler.h"
 144  #include "i18n.h"
 145  #include "log.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
 149 @@ -21,8 +21,6 @@
 150
 151  #include <trurl/trurl.h>
 152
 153 -#define ENABLE_TRACE 0
 154 -
 155  #include "compiler.h"
 156  #include "i18n.h"
 157  #include "log.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
 161 @@ -409,6 +409,7 @@
 162      struct pkg  pkg;
 163      int         rc;
 164
 165 +    DBGF("header_cap_match_req\n");
 166      rc = 0;
 167      memset(&pkg, 0, sizeof(pkg));
 168      pkg.caps = capreq_arr_new(0);
 169 @@ -456,7 +457,7 @@
 170      int is_file;
 171
 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));
 175
 176      if (!is_file && db_match(db, PMTAG_NAME, req, exclude, ma_flags))
 177          return 1;
 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
 181 @@ -14,7 +14,6 @@
 182  # include "config.h"
 183  #endif
 184
 185 -#define ENABLE_TRACE 0
 186  #include "i18n.h"
 187  #include "misc.h"
 188  #include "log.h"
 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
 192 @@ -14,7 +14,6 @@
 193  # include "config.h"
 194  #endif
 195
 196 -#define ENABLE_TRACE 0
 197  #include "i18n.h"
 198  #include "misc.h"
 199  #include "log.h"
 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 @@
 204              goto l_end;
 205
 206          } else {
 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);
 214          }
 215      }
 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
 219 @@ -28,7 +28,6 @@
 220  #include <trurl/narray.h>
 221  #include <trurl/nassert.h>
 222
 223 -#define ENABLE_TRACE 0
 224  #include "compiler.h"
 225  #include "tndb_int.h"
 226  #include "tndb.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
 230 @@ -27,7 +27,6 @@
 231  #include <trurl/trurl.h>
 232
 233  #include "sigint/sigint.h"
 234 -#define ENABLE_TRACE 0
 235  #include "compiler.h"
 236  #include "i18n.h"
 237  #include "log.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
 241 @@ -29,7 +29,6 @@
 242
 243  #include <sigint/sigint.h>
 244
 245 -#define ENABLE_TRACE 0
 246  #include "compiler.h"
 247  #include "i18n.h"
 248  #include "log.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
 252 @@ -50,7 +50,6 @@
 253
 254  #include <trurl/nassert.h>
 255  #include <trurl/nmalloc.h>
 256 -#define ENABLE_TRACE 0
 257  #include "compiler.h"
 258  #include "i18n.h"
 259  #include "log.h"                /* for DBGF */