openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File verifyscript.diff of Package rpm

--- lib/psm.c.orig	2012-04-18 15:32:27.000000000 +0000
+++ lib/psm.c	2012-04-18 15:33:17.000000000 +0000
@@ -781,7 +781,7 @@ static rpmRC runScript(rpmpsm psm, Heade
                    sname, WTERMSIG(psm->sq.status));
 	} else {
 	    /* filter out "regular" error exits from non-pre scriptlets */
-	    if ((stag != RPMTAG_PREIN && stag != RPMTAG_PREUN)) {
+	    if ((stag != RPMTAG_PREIN && stag != RPMTAG_PREUN && stag != RPMTAG_VERIFYSCRIPT)) {
 		warn_only = 1;
 	    }
 	    rpmlog(warn_only ? RPMLOG_WARNING : RPMLOG_ERR, 
--- lib/verify.c.orig	2012-04-18 15:29:28.000000000 +0000
+++ lib/verify.c	2012-04-18 15:31:52.000000000 +0000
@@ -280,8 +280,7 @@ static int rpmVerifyScript(QVA_t qva, rp
 
     /* create psm to run the script */
     psm = rpmpsmNew(ts, te);
-    rpmpsmScriptStage(psm, RPMTAG_VERIFYSCRIPT, RPMTAG_VERIFYSCRIPTPROG);
-    rc = rpmpsmStage(psm, PSM_SCRIPT);
+    rc = rpmpsmScriptStage(psm, RPMTAG_VERIFYSCRIPT, RPMTAG_VERIFYSCRIPTPROG);
     psm = rpmpsmFree(psm);
 
     if (scriptFd != NULL)

Places

File verifyscript.diff of Package rpm

Places