RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/lib/ transaction.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sun 19 Aug 2007 - 23:23:54 CEST
Message-Id: <20070819212354.9B9EF348458@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   19-Aug-2007 23:23:54
  Branch: HEAD                             Handle: 2007081922235400

  Modified files:
    rpm                     CHANGES
    rpm/lib                 transaction.c

  Log:
    - insure srpm file dispositions are FA_CREATE.

  Summary:
    Revision    Changes     Path
    1.1594      +1  -0      rpm/CHANGES
    1.332       +8  -1      rpm/lib/transaction.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1593 -r1.1594 CHANGES
  --- rpm/CHANGES	19 Aug 2007 21:12:22 -0000	1.1593
  +++ rpm/CHANGES	19 Aug 2007 21:23:54 -0000	1.1594
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: insure srpm file dispositions are FA_CREATE.
       - jbj: enable Header performance metrics, tied to --stats.
       - jbj: add Header performance metrics, disabled for now.
       - jbj: eliminate headerNVR, use headerNEVRA instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/transaction.c
  ============================================================================
  $ cvs diff -u -r1.331 -r1.332 transaction.c
  --- rpm/lib/transaction.c	19 Aug 2007 02:34:49 -0000	1.331
  +++ rpm/lib/transaction.c	19 Aug 2007 21:23:54 -0000	1.332
  @@ -1498,7 +1498,6 @@
   
   	(void) rpmdbCheckSignals();
   
  -	if (p->isSource) continue;
   	if ((fi = rpmtsiFi(pi)) == NULL)
   	    continue;	/* XXX can't happen */
   	fc = rpmfiFC(fi);
  @@ -1508,6 +1507,14 @@
   
   	if (fc == 0) continue;
   
  +	/* All source files get installed. */
  +	if (p->isSource) {
  + 	    fi = rpmfiInit(fi, 0);
  +	    while ((i = rpmfiNext(fi)) >= 0)
  +		fi->actions[i] = FA_CREATE;
  +	    continue;
  +	}
  +
   	(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_FINGERPRINT), 0);
   	/* Extract file info for all files in this package from the database. */
   	matches = xcalloc(fc, sizeof(*matches));
  @@ .
Received on Sun Aug 19 23:23:54 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.