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 19:46:28
  Branch: HEAD                             Handle: 2008013118462701

  Modified files:
    rpm                     CHANGES
    rpm/lib                 depends.c

  Log:
    - jbj: retrieve old originTime earlier to include identical package
    replace.

  Summary:
    Revision    Changes     Path
    1.2115      +1  -0      rpm/CHANGES
    1.386       +9  -9      rpm/lib/depends.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2114 -r1.2115 CHANGES
  --- rpm/CHANGES	31 Jan 2008 15:35:09 -0000	1.2114
  +++ rpm/CHANGES	31 Jan 2008 18:46:27 -0000	1.2115
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - jbj: retrieve old originTime earlier to include identical package replace.
       - jbj: fix: functional "-N-V-R.A" erasures-within-upgrade transactions.
       - jbj: fix: retrieve originTime from old, not new, header.
       - jbj: permit "-N-V-R.A" erasure args within install/upgrade transactions.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  ============================================================================
  $ cvs diff -u -r1.385 -r1.386 depends.c
  --- rpm/lib/depends.c	31 Jan 2008 14:23:36 -0000	1.385
  +++ rpm/lib/depends.c	31 Jan 2008 18:46:28 -0000	1.386
  @@ -418,6 +418,15 @@
   	if (tscolor && hcolor && ohcolor && !(hcolor & ohcolor))
   	    continue;
   
  +	/* Snarf the original install time from older package(s). */
  +	he->tag = RPMTAG_ORIGINTIME;
  +	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];
  +	    he->p.ptr = _free(he->p.ptr);
  +	}
  +
   	/* Skip identical packages. */
   	if (rpmHeadersIdentical(h, oh))
   	    continue;
  @@ -431,15 +440,6 @@
   	/* Chain through upgrade flink. */
   	xx = rpmteChain(p, q, oh, "Upgrades");
   
  -	/* Snarf the original install time from older package(s). */
  -	he->tag = RPMTAG_ORIGINTIME;
  -	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];
  -	    he->p.ptr = _free(he->p.ptr);
  -	}
  -
   /*@-nullptrarith@*/
   	rpmlog(RPMLOG_DEBUG, D_("   upgrade erases %s\n"), rpmteNEVRA(q));
   /*@=nullptrarith@*/
  @@ .