From e241f3d3ed5a12ca870ad69f7ae3240acfaa13a5 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 3 Oct 2008 11:38:08 +0300
Subject: [PATCH] Assume failure in psm runScript()

---
 lib/psm.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/psm.c b/lib/psm.c
index 4dc714c..2905d36 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -702,13 +702,13 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
     int xx;
     FD_t scriptFd;
     FD_t out = NULL;
-    rpmRC rc = RPMRC_OK;
+    rpmRC rc = RPMRC_FAIL; /* assume failure */
     char *nevra, *sname = NULL; 
     struct rpmtd_s prefixes;
 
     assert(argvp != NULL);
     if (*argvp == NULL && script == NULL)
-	return rc;
+	return RPMRC_OK;
 
     if (*argvp && strcmp(*argvp[0], "<lua>") == 0) {
 	return runLuaScript(psm, h, stag, *argvp, script, arg1, arg2);
@@ -729,7 +729,7 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
 	    rpmlog(RPMLOG_DEBUG, "%s: %s skipping redundant \"%s\".\n",
 		   psm->stepName, sname, *argvp[0]);
 	    free(sname);
-	    return rc;
+	    return RPMRC_OK;
 	}
     }
 
@@ -758,7 +758,6 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
 	if (fd == NULL || Ferror(fd)) {
 	    rpmlog(RPMLOG_ERR, _("Couldn't create temporary file for %s: %s\n"),
 		   sname, strerror(errno));
-	    rc = RPMRC_FAIL;
 	    goto exit;
 	}
 
@@ -808,7 +807,6 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
     if (out == NULL) { 
 	rpmlog(RPMLOG_ERR, _("Couldn't duplicate file descriptor: %s: %s\n"),
 	       sname, strerror(errno));
-	rc = RPMRC_FAIL;	
 	goto exit;
     }
 
@@ -821,7 +819,6 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
 
     if (psm->sq.child == (pid_t)-1) {
 	rpmlog(RPMLOG_ERR, _("Couldn't fork %s: %s\n"), sname, strerror(errno));
-	rc = RPMRC_FAIL;
 	goto exit;
     }
 
@@ -832,7 +829,6 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
 				 stag, WTERMSIG(psm->sq.child));
 	rpmlog(RPMLOG_ERR, _("%s scriptlet failed, waitpid(%d) rc %d: %s\n"),
 		 sname, psm->sq.child, psm->sq.reaped, strerror(errno));
-	rc = RPMRC_FAIL;
     } else if (!WIFEXITED(psm->sq.status) || WEXITSTATUS(psm->sq.status)) {
       	if (WIFSIGNALED(psm->sq.status)) {
 	    (void)rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR,
@@ -845,7 +841,9 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
 	    rpmlog(RPMLOG_ERR, _("%s scriptlet failed, exit status %d\n"),
 		   sname, WEXITSTATUS(psm->sq.status));
 	}
-	rc = RPMRC_FAIL;
+    } else {
+	/* if we get this far we're clear */
+	rc = RPMRC_OK;
     }
 
 exit:
-- 
2.7.4