sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/psm.c: make runScript() print the disttag on errors

Browse Source
This commit is contained in:
Ivan Zakharyaschev 2019-02-25 08:10:51 +03:00
parent 9dfcf26d97
commit 2b320b142d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/psm.c
View File

@ -749,7 +749,7 @@ static int runScript(PSM_t psm, Header h,
int freePrefixes = 0; int freePrefixes = 0;
FD_t out; FD_t out;
rpmRC rc = RPMRC_OK; rpmRC rc = RPMRC_OK;
const char *n = NULL, *v = NULL, *r = NULL; const char *n = NULL, *v = NULL, *r = NULL, *d = NULL;
char arg1_str [sizeof(int)*3+1] = ""; char arg1_str [sizeof(int)*3+1] = "";
char arg2_str [sizeof(int)*3+1] = ""; char arg2_str [sizeof(int)*3+1] = "";
@ -767,7 +767,7 @@ static int runScript(PSM_t psm, Header h,
} }
if (h) if (h)
xx = headerNVR(h, &n, &v, &r); xx = headerNVRD(h, &n, &v, &r, &d);
if (arg1 >= 0) if (arg1 >= 0)
sprintf(arg1_str, "%d", arg1); sprintf(arg1_str, "%d", arg1);
@ -935,15 +935,15 @@ static int runScript(PSM_t psm, Header h,
if (waitpid(child, &status, 0) < 0) { if (waitpid(child, &status, 0) < 0) {
rpmError(RPMERR_SCRIPT, rpmError(RPMERR_SCRIPT,
_("execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"), _("execution of %s scriptlet from %s-%s-%s%s%s failed, waitpid returned %s\n"),
sln, n, v, r, strerror (errno)); sln, n, v, r, d ? ":" : "", d ? : "", strerror (errno));
/* XXX what to do here? */ /* XXX what to do here? */
rc = RPMRC_OK; rc = RPMRC_OK;
} else { } else {
if (!WIFEXITED(status) || WEXITSTATUS(status)) { if (!WIFEXITED(status) || WEXITSTATUS(status)) {
rpmError(RPMERR_SCRIPT, rpmError(RPMERR_SCRIPT,
_("execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"), _("execution of %s scriptlet from %s-%s-%s%s%s failed, exit status %d\n"),
sln, n, v, r, WEXITSTATUS(status)); sln, n, v, r, d ? ":" : "", d ? : "", WEXITSTATUS(status));
rc = RPMRC_FAIL; rc = RPMRC_FAIL;
} }
} }