Revert back to rpmdbRemove() taking instance number instead of actual header

- On package reinstall (ie --replacepkgs) we only know the old header
  by the instance number, and grabbing the header from the db in
  psm as a special case for that is more trouble than just doing what
  we always did.
- Reverts commit e16695e932e294ec600e673d38c41bde20931204 and unbreaks
  the --replacepkgs test case

1 files changed, 6 insertions, 11 deletions

diff --git a/lib/psm.c b/lib/psm.c
index 525b1f4fd..75cafcb9f 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1088,17 +1088,12 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
     }   break;
 
     case PSM_RPMDB_REMOVE:
-	if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)) {
-	    Header h = rpmteHeader(psm->te);
-
-	    (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
-	    rc = rpmdbRemove(rpmtsGetRdb(ts), h);
-	    (void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
-
-	    if (rc == RPMRC_OK)
-		rpmteSetDBInstance(psm->te, 0);
-	    headerFree(h);
-	}
+	if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)	break;
+	(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
+	rc = rpmdbRemove(rpmtsGetRdb(ts), rpmteDBInstance(psm->te));
+	(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
+	if (rc == RPMRC_OK)
+	    rpmteSetDBInstance(psm->te, 0);
 	break;
 
     default: