RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 07-Nov-2009 17:02:34 Branch: HEAD Handle: 2009110716023400 Modified files: rpm CHANGES rpm/rpmdb rpmdb.c Log: - rpmdb: abandon RPMTAG_BASENAMES lookup, use RPMTAG_FILEPATHS instead. Summary: Revision Changes Path 1.3143 +1 -0 rpm/CHANGES 1.328 +8 -1 rpm/rpmdb/rpmdb.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3142 -r1.3143 CHANGES --- rpm/CHANGES 23 Oct 2009 01:19:33 -0000 1.3142 +++ rpm/CHANGES 7 Nov 2009 16:02:34 -0000 1.3143 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 + - jbj: rpmdb: abandon RPMTAG_BASENAMES lookup, use RPMTAG_FILEPATHS instead. - jbj: rpmts: stub-in a grandparent transaction. - jbj: poptDB: wire up --rpmtxndebug, collect other rpmdb debugging options. - jbj: rpmte: stub-in a parent transaction. @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmdb.c ============================================================================ $ cvs diff -u -r1.327 -r1.328 rpmdb.c --- rpm/rpmdb/rpmdb.c 22 Oct 2009 17:10:20 -0000 1.327 +++ rpm/rpmdb/rpmdb.c 7 Nov 2009 16:02:34 -0000 1.328 @@ -2884,10 +2884,17 @@ (void) rpmdbCheckSignals(); + switch (tag) { + default: break; /* XXX HACK to remove rpmdbFindByLabel/findMatches from the API */ - if (tag == RPMDBI_LABEL) { + case RPMDBI_LABEL: tag = RPMTAG_NAME; isLabel = 1; + break; + /* XXX HACK to remove the existing complexity of RPMTAG_BASENAMES */ + case RPMTAG_BASENAMES: + tag = RPMTAG_FILEPATHS; + break; } dbi = dbiOpen(db, tag, 0); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org