Lose now unnecessary progTag from psm

- our scriptlet thingie knows which progtag to use for a given script tag
  already, no need to baby-feed the psm

diff --git a/lib/psm.c b/lib/psm.c
index 269407b..94e5273 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -41,7 +41,6 @@ struct rpmpsm_s {
     char * rpmio_flags;
     char * failedFile;
     int scriptTag;             /*!< Scriptlet data tag. */
-    int progTag;               /*!< Scriptlet interpreter tag. */
     int npkgs_installed;       /*!< No. of installed instances. */
     int scriptArg;             /*!< Scriptlet package arg. */
     rpmsenseFlags sense;       /*!< One of RPMSENSE_TRIGGER{PREIN,IN,UN,POSTUN}. */
@@ -685,11 +684,10 @@ rpmpsm rpmpsmFree(rpmpsm psm)
     return NULL;
 }
 
-rpmRC rpmpsmScriptStage(rpmpsm psm, rpmTag scriptTag, rpmTag progTag)
+rpmRC rpmpsmScriptStage(rpmpsm psm, rpmTag scriptTag)
 {
     assert(psm != NULL);
     psm->scriptTag = scriptTag;
-    psm->progTag = progTag;
     if (scriptTag == RPMTAG_VERIFYSCRIPT) {
        psm->stepName = "verify";
     }
@@ -814,7 +812,6 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
 
        if (psm->goal == PSM_PKGINSTALL) {
            psm->scriptTag = RPMTAG_PREIN;
-           psm->progTag = RPMTAG_PREINPROG;
            psm->sense = RPMSENSE_TRIGGERPREIN;
            psm->countCorrection = 0;   /* XXX is this correct?!? */
 
@@ -836,7 +833,6 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
 
        if (psm->goal == PSM_PKGERASE) {
            psm->scriptTag = RPMTAG_PREUN;
-           psm->progTag = RPMTAG_PREUNPROG;
            psm->sense = RPMSENSE_TRIGGERUN;
            psm->countCorrection = -1;
 
@@ -976,7 +972,6 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
            if (rc) break;
 
            psm->scriptTag = RPMTAG_POSTIN;
-           psm->progTag = RPMTAG_POSTINPROG;
            psm->sense = RPMSENSE_TRIGGERIN;
            psm->countCorrection = 0;
 
@@ -1001,7 +996,6 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
        if (psm->goal == PSM_PKGERASE) {
 
            psm->scriptTag = RPMTAG_POSTUN;
-           psm->progTag = RPMTAG_POSTUNPROG;
            psm->sense = RPMSENSE_TRIGGERPOSTUN;
            psm->countCorrection = -1;
 

diff --git a/lib/psm.h b/lib/psm.h
index 9a61ecf..3fc1b7e 100644 (file)
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -107,14 +107,13 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage);
 #define        rpmpsmUNSAFE    rpmpsmSTAGE
 
 /**
- * Run rpmpsmStage(PSM_SCRIPT) for scriptTag and progTag
+ * Run rpmpsmStage(PSM_SCRIPT) for scriptTag
  * @param psm          package state machine data
  * @param scriptTag    scriptlet tag to execute
- * @param progTag      scriptlet prog tag to execute
  * @return             0 on success
  */
 RPM_GNUC_INTERNAL
-rpmRC rpmpsmScriptStage(rpmpsm psm, rpmTag scriptTag, rpmTag progTag);
+rpmRC rpmpsmScriptStage(rpmpsm psm, rpmTag scriptTag);
 
 #ifdef __cplusplus
 }

diff --git a/lib/transaction.c b/lib/transaction.c
index 819466b..3fca131 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1184,16 +1184,10 @@ static int runTransScripts(rpmts ts, rpmTag stag)
     rpmtsi pi; 
     rpmte p;
     rpmpsm psm;
-    rpmTag progtag = RPMTAG_NOT_FOUND;
     int xx;
 
-    if (stag == RPMTAG_PRETRANS) {
-       progtag = RPMTAG_PRETRANSPROG;
-    } else if (stag == RPMTAG_POSTTRANS) {
-       progtag = RPMTAG_POSTTRANSPROG;
-    } else {
+    if (stag != RPMTAG_PRETRANS && stag != RPMTAG_POSTTRANS)
        return -1;
-    }
 
     pi = rpmtsiInit(ts);
     while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) {
@@ -1203,7 +1197,7 @@ static int runTransScripts(rpmts ts, rpmTag stag)
 
        if (rpmteOpen(p, ts, 0)) {
            psm = rpmpsmNew(ts, p);
-           xx = rpmpsmScriptStage(psm, stag, progtag);
+           xx = rpmpsmScriptStage(psm, stag);
            psm = rpmpsmFree(psm);
            rpmteClose(p, ts, 0);
        }

diff --git a/lib/verify.c b/lib/verify.c
index 1068cfe..7758b19 100644 (file)
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -285,7 +285,7 @@ static int rpmVerifyScript(QVA_t qva, rpmts ts, Header h, FD_t scriptFd)
 
     /* create psm to run the script */
     psm = rpmpsmNew(ts, te);
-    rpmpsmScriptStage(psm, RPMTAG_VERIFYSCRIPT, RPMTAG_VERIFYSCRIPTPROG);
+    rpmpsmScriptStage(psm, RPMTAG_VERIFYSCRIPT);
     rc = rpmpsmStage(psm, PSM_SCRIPT);
     psm = rpmpsmFree(psm);