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

Actually report the involved macro names in macro tracebacks 

Should make macro debugging a little saner, including but not limited
to Lua.

Fixes: #545
This commit is contained in:
Panu Matilainen 2021-01-25 14:29:08 +02:00 committed by Florian Festi
parent 5bfb49d6b7
commit f67d239ccd
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpmio/macro.c
View File

@ -355,10 +355,11 @@ printMacro(MacroBuf mb, const char * s, const char * se)
* @param te end of string
*/
static void
printExpansion(MacroBuf mb, const char * t, const char * te)
printExpansion(MacroBuf mb, rpmMacroEntry me, const char * t, const char * te)
{
const char *mname = me ? me->name : "";
if (!(te > t)) {
fprintf(stderr, _("%3d<%*s(empty)\n"), mb->depth, (2 * mb->depth + 1), "");
fprintf(stderr, "%3d<%*s (%%%s)\n", mb->depth, (2 * mb->depth + 1), "", mname);
return;
}
@ -374,7 +375,7 @@ printExpansion(MacroBuf mb, const char * t, const char * te)
}
fprintf(stderr, "%3d<%*s", mb->depth, (2 * mb->depth + 1), "");
fprintf(stderr, "%3d<%*s (%%%s)\n", mb->depth, (2 * mb->depth + 1), "", mname);
if (te > t)
fprintf(stderr, "%.*s", (int)(te - t), t);
fprintf(stderr, "\n");
@ -466,14 +467,14 @@ static int mbInit(MacroBuf mb, MacroExpansionData *med, size_t slen)
return 0;
}
static void mbFini(MacroBuf mb, MacroExpansionData *med)
static void mbFini(MacroBuf mb, rpmMacroEntry me, MacroExpansionData *med)
{
mb->buf[mb->tpos] = '\0';
mb->depth--;
if (mb->error && rpmIsVerbose())
mb->expand_trace = 1;
if (mb->expand_trace)
printExpansion(mb, mb->buf + med->tpos, mb->buf + mb->tpos);
printExpansion(mb, me, mb->buf + med->tpos, mb->buf + mb->tpos);
mb->macro_trace = med->macro_trace;
mb->expand_trace = med->expand_trace;
}
@ -1382,7 +1383,7 @@ static int
expandMacro(MacroBuf mb, const char *src, size_t slen)
{
rpmMacroEntry *mep;
rpmMacroEntry me;
rpmMacroEntry me = NULL;
const char *s = src, *se;
const char *f, *fe;
const char *g, *ge;
@ -1551,7 +1552,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
s = se + (g ? 0 : fwd);
}
mbFini(mb, &med);
mbFini(mb, me, &med);
exit:
_free(source);
return mb->error;
@ -1576,7 +1577,7 @@ expandThisMacro(MacroBuf mb, rpmMacroEntry me, ARGV_const_t args, int flags)
if (mb->macro_trace) {
ARGV_const_t av = args;
fprintf(stderr, "%3d>%*s%%%s", mb->depth, (2 * mb->depth + 1), "", me->name);
fprintf(stderr, "%3d>%*s (%%%s)", mb->depth, (2 * mb->depth + 1), "", me->name);
for (av = args; av && *av; av++)
fprintf(stderr, " %s", *av);
fprintf(stderr, "\n");
@ -1602,7 +1603,7 @@ expandThisMacro(MacroBuf mb, rpmMacroEntry me, ARGV_const_t args, int flags)
if (optargs)
argvFree(optargs);
mbFini(mb, &med);
mbFini(mb, me, &med);
exit:
return mb->error;
}

22
tests/rpmmacro.at
View File

@ -968,3 +968,25 @@ read
[])
AT_CLEANUP
AT_SETUP([macro traceback])
AT_KEYWORDS([macros])
AT_CHECK([
for o in "-v" ""; do
runroot rpm $o \
--define "err %{error:bad}" \
--define "bar %err" \
--define "foo %bar zz" \
--eval "xxx%{foo}yyy"
done
],
[1],
[],
[error: bad
3< (%error)
2< (%err)
1< (%bar)
0< (%foo)
xxx
error: bad
])
AT_CLEANUP