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

  Server: rpm5.org                         Name:   Alexey Tourbin
  Root:   /v/rpm/cvs                       Email:  at@rpm5.org
  Module: rpm                              Date:   27-Aug-2008 14:58:24
  Branch: HEAD                             Handle: 2008082712582400

  Modified files:
    rpm/rpmdb               rpmdb.c

  Log:
    rpmdb.c (rpmdbInitIterator): restored isLabel check before dbiOpen

  Summary:
    Revision    Changes     Path
    1.270       +8  -3      rpm/rpmdb/rpmdb.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.269 -r1.270 rpmdb.c
  --- rpm/rpmdb/rpmdb.c	27 Aug 2008 12:25:47 -0000	1.269
  +++ rpm/rpmdb/rpmdb.c	27 Aug 2008 12:58:24 -0000	1.270
  @@ -2636,12 +2636,19 @@
       rpmdbMatchIterator mi;
       dbiIndexSet set = NULL;
       dbiIndex dbi;
  +    int isLabel = 0;
   
       if (db == NULL)
   	return NULL;
   
       (void) rpmdbCheckSignals();
   
  +    /* XXX HACK to remove rpmdbFindByLabel/findMatches from the API */
  +    if (rpmtag == RPMDBI_LABEL) {
  +	rpmtag = RPMTAG_NAME;
  +	isLabel = 1;
  +    }
  +
       dbi = dbiOpen(db, rpmtag, 0);
       if (dbi == NULL)
   	return NULL;
  @@ -2681,9 +2688,7 @@
   	int rc;
   	int xx;
   
  -	/* XXX HACK to remove rpmdbFindByLabel/findMatches from the API */
  -	if (rpmtag == RPMDBI_LABEL) {
  -	    rpmtag = RPMTAG_NAME;
  +	if (isLabel) {
   	    xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0);
   	    rc = dbiFindByLabel(dbi, dbcursor, &k, &v, keyp, &set);
   	    xx = dbiCclose(dbi, dbcursor, 0);
  @@ .