From 801a36d69beffc383b5cf4fbb63534ead9dfe84a Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 25 Nov 2008 12:17:47 +0200 Subject: Rework rpmtsProcess() to use rpmteOpen+Close for both install and erase - both cases behave fairly symmetrically now - helps streamlining the process, we get the transaction element and file info for it before creating the package state machine so we dont' need to fuss around with updated file info etc --- lib/psm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib/psm.c') diff --git a/lib/psm.c b/lib/psm.c index 05679b3c4..43d1dccf7 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1260,11 +1260,8 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) } if (psm->goal == PSM_PKGERASE) { psm->scriptArg = psm->npkgs_installed - 1; - - /* Retrieve installed header. */ - rc = rpmpsmNext(psm, PSM_RPMDB_LOAD); - if (rc == RPMRC_OK && psm->te) - rpmteSetHeader(psm->te, fi->h); + /* XXX preserve RPMDB_LOAD behavior for now */ + fi->h = rpmteHeader(psm->te); } break; case PSM_PRE: -- cgit v1.2.3