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:   22-Sep-2007 23:25:16
  Branch: HEAD                             Handle: 2007092222251600

  Modified files:
    rpm                     CHANGES
    rpm/lib                 psm.c

  Log:
    - rpm.org: ensure that yum's broken transaction checks "work"
    (#259961).

  Summary:
    Revision    Changes     Path
    1.1639      +1  -0      rpm/CHANGES
    2.228       +5  -4      rpm/lib/psm.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1638 -r1.1639 CHANGES
  --- rpm/CHANGES	22 Sep 2007 21:12:56 -0000	1.1638
  +++ rpm/CHANGES	22 Sep 2007 21:25:16 -0000	1.1639
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rpm.org: ensure that yum's broken transaction checks "work" (#259961).
       - jbj: handle more white space in paths.
       - jbj: make the rpm hacker's entrance exam buggery harder (#281391).
       - jbj: don't punish monkeys who insist on "My Widdle .spec" naming.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.227 -r2.228 psm.c
  --- rpm/lib/psm.c	8 Sep 2007 22:42:36 -0000	2.227
  +++ rpm/lib/psm.c	22 Sep 2007 21:25:16 -0000	2.228
  @@ -1933,20 +1933,21 @@
   
   	    if (rpmtsFlags(ts) & RPMTRANS_FLAG_JUSTDB)	break;
   	    if (rpmtsFlags(ts) & RPMTRANS_FLAG_APPLYONLY)	break;
  -	    if (fc <= 0)				break;
   
   	    psm->what = RPMCALLBACK_UNINST_START;
   	    psm->amount = fc;		/* XXX W2DO? looks wrong. */
   	    psm->total = fc;
   	    xx = rpmpsmNext(psm, PSM_NOTIFY);
   
  -	    rc = fsmSetup(fi->fsm, FSM_PKGERASE, psm->payload_format, ts, fi,
  +	    if (fc > 0) {
  +		rc = fsmSetup(fi->fsm, FSM_PKGERASE, psm->payload_format, ts, fi,
   			NULL, NULL, &psm->failedFile);
  -	    xx = fsmTeardown(fi->fsm);
  +		xx = fsmTeardown(fi->fsm);
  +	    }
   
   	    psm->what = RPMCALLBACK_UNINST_STOP;
   	    psm->amount = 0;		/* XXX W2DO? looks wrong. */
  -	    psm->total = fc;
  +	    psm->total = (fc ? fc : 100);
   	    xx = rpmpsmNext(psm, PSM_NOTIFY);
   
   	}
  @@ .