RPM Community Forums

Mailing List Message of <rpm-cvs>

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

From: Jeff Johnson <jbj@rpm5.org>
Date: Thu 31 Jan 2008 - 15:23:36 CET
Message-Id: <20080131142336.9A404348471@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:   31-Jan-2008 15:23:36
  Branch: HEAD                             Handle: 2008013114233600

  Modified files:
    rpm                     CHANGES
    rpm/lib                 depends.c

  Log:
    - jbj: fix: retrieve originTime from old, not new, header.

  Summary:
    Revision    Changes     Path
    1.2113      +1  -0      rpm/CHANGES
    1.385       +1  -1      rpm/lib/depends.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2112 -r1.2113 CHANGES
  --- rpm/CHANGES	31 Jan 2008 07:26:12 -0000	1.2112
  +++ rpm/CHANGES	31 Jan 2008 14:23:36 -0000	1.2113
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - jbj: fix: retrieve originTime from old, not new, header.
       - jbj: permit "-N-V-R.A" erasure args within install/upgrade transactions.
       - jbj: propagate the time a package was first installed through upgrades (available via tag "ORIGINTIME").
       - jbj: replace sr.po from translation project.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  ============================================================================
  $ cvs diff -u -r1.384 -r1.385 depends.c
  --- rpm/lib/depends.c	31 Jan 2008 07:26:12 -0000	1.384
  +++ rpm/lib/depends.c	31 Jan 2008 14:23:36 -0000	1.385
  @@ -433,7 +433,7 @@
   
   	/* Snarf the original install time from older package(s). */
   	he->tag = RPMTAG_ORIGINTIME;
  -	xx = headerGet(h, he, 0);
  +	xx = headerGet(oh, he, 0);
   	if (xx && he->p.ui32p != NULL) {
   	    if (p->originTime == 0 || p->originTime > he->p.ui32p[0])
   		p->originTime = he->p.ui32p[0];
  @@ .
Received on Thu Jan 31 15:23:36 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.