RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  [email protected]
  Module: rpm                              Date:   27-Jun-2009 21:01:29
  Branch: HEAD                             Handle: 2009062719012801

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmfc.c

  Log:
    - rpmfc: reduce the amount of debugging noise with lots of files.

  Summary:
    Revision    Changes     Path
    1.3035      +1  -0      rpm/CHANGES
    1.67        +6  -0      rpm/lib/rpmfc.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3034 -r1.3035 CHANGES
  --- rpm/CHANGES       27 Jun 2009 04:10:51 -0000      1.3034
  +++ rpm/CHANGES       27 Jun 2009 19:01:28 -0000      1.3035
  @@ -1,5 +1,6 @@
   
   5.2b1 -> 5.3a1
  +    - jbj: rpmfc: reduce the amount of debugging noise with lots of files.
       - jbj: rpmbf: use lookup3.c hash pairs with k linear combinations.
       - jbj: rpmbf: stub-in a Bloom filter.
       - jbj: selinux: fix: disabler bit toggle sense was inverted.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfc.c
  ============================================================================
  $ cvs diff -u -r1.66 -r1.67 rpmfc.c
  --- rpm/lib/rpmfc.c   14 Jun 2009 18:17:06 -0000      1.66
  +++ rpm/lib/rpmfc.c   27 Jun 2009 19:01:29 -0000      1.67
  @@ -1128,6 +1128,7 @@
       magicfile = rpmExpand("%{?_rpmfc_magic_path}", NULL);
       if (magicfile == NULL || *magicfile == '\0')
        magicfile = _free(magicfile);
  +
       mg = rpmmgNew(magicfile, 0);
   assert(mg != NULL);  /* XXX figger a proper return path. */
   
  @@ -1207,6 +1208,8 @@
        }
   
        se = ftype;
  +
  +if (_rpmfc_debug)    /* XXX noisy */
        rpmlog(RPMLOG_DEBUG, "%s: %s\n", s, se);
   
        /* Save the path. */
  @@ -1247,6 +1250,9 @@
       fcav = argvFree(fcav);
   
       mg = rpmmgFree(mg);
  +    rpmlog(RPMLOG_DEBUG,
  +             D_("categorized %d files into %d classes (using %s).\n"),
  +             fc->nfiles, argvCount(fc->cdict), magicfile);
       magicfile = _free(magicfile);
   
       return RPMRC_OK;
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to