RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   13-Sep-2010 00:22:19
  Branch: HEAD                             Handle: 2010091222221900

  Modified files:
    rpm/lib                 rpmgi.c

  Log:
    - rpmgi: rearrange debugging spewage slightly.

  Summary:
    Revision    Changes     Path
    2.73        +6  -3      rpm/lib/rpmgi.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmgi.c
  ============================================================================
  $ cvs diff -u -r2.72 -r2.73 rpmgi.c
  --- rpm/lib/rpmgi.c	10 Dec 2009 18:52:18 -0000	2.72
  +++ rpm/lib/rpmgi.c	12 Sep 2010 22:22:19 -0000	2.73
  @@ -552,7 +552,7 @@
   	return rpmrc;
   
   if (_rpmgi_debug)
  -fprintf(stderr, "*** rpmgiNext(%p) tag %s\n", gi, tagName(gi->tag));
  +fprintf(stderr, "--> %s(%p) tag %s\n", __FUNCTION__, gi, tagName(gi->tag));
   
       /* Free header from previous iteration. */
       (void)headerFree(gi->h);
  @@ -735,8 +735,7 @@
   	} else
   	    xx = rpmtsAddInstallElement(gi->ts, gi->h, (fnpyKey)gi->hdrPath, 2, NULL);
       }
  -
  -    return rpmrc;
  +    goto exit;
   
   enditer:
       if (gi->flags & RPMGI_TSORDER) {
  @@ -780,6 +779,10 @@
       gi->hdrPath = _free(gi->hdrPath);
       gi->i = -1;
       gi->active = 0;
  +
  +exit:
  +if (_rpmgi_debug)
  +fprintf(stderr, "<-- %s(%p) rc %d\n", __FUNCTION__, gi, rpmrc);
       return rpmrc;
   }
   
  @@ .