From 180a34737203f0cc1e0d843915387ce9ffeb894c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 14 Apr 2008 18:15:39 +0300 Subject: [PATCH] Fix indentation, no functional changes --- lib/psm.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/psm.c b/lib/psm.c index ea324b5..b8f52c1 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -834,19 +834,18 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp, 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, - stag, WTERMSIG(psm->sq.status)); - rpmlog(RPMLOG_ERR, _("%s scriptlet failed, signal %d\n"), - sname, WTERMSIG(psm->sq.status)); - } else { - (void) rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, + } else if (!WIFEXITED(psm->sq.status) || WEXITSTATUS(psm->sq.status)) { + if (WIFSIGNALED(psm->sq.status)) { + (void)rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, + stag, WTERMSIG(psm->sq.status)); + rpmlog(RPMLOG_ERR, _("%s scriptlet failed, signal %d\n"), + sname, WTERMSIG(psm->sq.status)); + } else { + (void) rpmtsNotify(ts, psm->te, RPMCALLBACK_SCRIPT_ERROR, stag, WEXITSTATUS(psm->sq.status)); - rpmlog(RPMLOG_ERR, _("%s scriptlet failed, exit status %d\n"), - sname, WEXITSTATUS(psm->sq.status)); - } + rpmlog(RPMLOG_ERR, _("%s scriptlet failed, exit status %d\n"), + sname, WEXITSTATUS(psm->sq.status)); + } rc = RPMRC_FAIL; } -- 2.7.4