folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use rpmteNEVRA() for scriptlet messages now that it's possible

This commit is contained in:
Panu Matilainen 2008-11-26 19:04:02 +02:00
parent e56768c279
commit 5bfe303201
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/psm.c
View File

@ -436,15 +436,13 @@ static rpmRC runLuaScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t argv,
int warn_only = 0;
const rpmts ts = psm->ts;
#ifdef WITH_LUA
char *nevra, *sname = NULL;
char *sname = NULL;
int rootFd = -1;
int xx;
rpmlua lua = NULL; /* Global state. */
rpmluav var;
nevra = headerGetNEVRA(h, NULL);
rasprintf(&sname, "%s(%s)", tag2sln(stag), nevra);
free(nevra);
rasprintf(&sname, "%s(%s)", tag2sln(stag), rpmteNEVRA(psm->te));
rpmlog(RPMLOG_DEBUG, "%s: %s running <lua> scriptlet.\n",
psm->stepName, sname);
@ -640,7 +638,7 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
FD_t out = NULL;
rpmRC rc = RPMRC_FAIL; /* assume failure */
int warn_only = 0;
char *nevra, *sname = NULL;
char *sname = NULL;
struct rpmtd_s prefixes;
assert(argvp != NULL);
@ -650,11 +648,7 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag, ARGV_t * argvp,
if (*argvp && strcmp(*argvp[0], "<lua>") == 0) {
return runLuaScript(psm, h, stag, *argvp, script, arg1, arg2);
}
/* XXX FIXME: except for %verifyscript, rpmteNEVR could be used. */
nevra = headerGetNEVRA(h, NULL);
rasprintf(&sname, "%s(%s)", tag2sln(stag), nevra);
free(nevra);
rasprintf(&sname, "%s(%s)", tag2sln(stag), rpmteNEVRA(psm->te));
psm->sq.reaper = 1;