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

Allow an optional argument for the %verbose macro 

This improves compatibility with old rpm versions. If an argument
is present, the macro expands to it in verbose mode and to an
empty string if not in verbose mode.
This commit is contained in:
Michael Schroeder 2021-10-06 16:06:59 +02:00 committed by Panu Matilainen
parent bfbd0b3e7f
commit 26767d4646
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/manual/macros.md
View File

@ -71,6 +71,8 @@ to perform useful operations. The current list is
%getconfdir expand to rpm "home" directory (typically /usr/lib/rpm)
%dnl discard to next line (without expanding)
%verbose expand to 1 if rpm is in verbose mode, 0 if not
%{verbose:...} expand to ... if rpm is in verbose mode, the
empty string if not
%{echo:...} print ... to stdout
%{warn:...} print warning: ... to stderr

18
rpmio/macro.c
View File

@ -1122,7 +1122,11 @@ static void doExpand(MacroBuf mb, rpmMacroEntry me, ARGV_t argv, size_t *parsed)
static void doVerbose(MacroBuf mb, rpmMacroEntry me, ARGV_t argv, size_t *parsed)
{
mbAppend(mb, rpmIsVerbose() ? '1' : '0');
if (parsed || !argv || !argv[1]) {
mbAppend(mb, rpmIsVerbose() ? '1' : '0');
} else if (rpmIsVerbose() && *argv[1]) {
expandMacro(mb, argv[1], 0);
}
}
static void doShescape(MacroBuf mb, rpmMacroEntry me, ARGV_t argv, size_t *parsed)
@ -1242,9 +1246,9 @@ static struct builtins_s {
{ "P", doSP, 1, 0 },
{ "S", doSP, 1, 0 },
{ "basename", doFoo, 1, 0 },
{ "define", doDef, -1, ME_PARSE },
{ "define", doDef, 1, ME_PARSE },
{ "dirname", doFoo, 1, 0 },
{ "dnl", doDnl, -1, ME_PARSE },
{ "dnl", doDnl, 1, ME_PARSE },
{ "dump", doDump, 0, 0 },
{ "echo", doOutput, 1, 0 },
{ "error", doOutput, 1, 0 },
@ -1254,9 +1258,9 @@ static struct builtins_s {
{ "getconfdir", doFoo, 0, 0 },
{ "getenv", doFoo, 1, 0 },
{ "getncpus", doFoo, 0, 0 },
{ "global", doGlobal, -1, ME_PARSE },
{ "global", doGlobal, 1, ME_PARSE },
{ "load", doLoad, 1, 0 },
{ "lua", doLua, -1, ME_PARSE },
{ "lua", doLua, 1, ME_PARSE },
{ "macrobody", doBody, 1, 0 },
{ "quote", doFoo, 1, 0 },
{ "shrink", doFoo, 1, 0 },
@ -1267,7 +1271,7 @@ static struct builtins_s {
{ "uncompress", doUncompress, 1, 0 },
{ "undefine", doUndefine, 1, 0 },
{ "url2path", doFoo, 1, 0 },
{ "verbose", doVerbose, 0, 0 },
{ "verbose", doVerbose, -1, ME_PARSE },
{ "warn", doOutput, 1, 0 },
{ NULL, NULL, 0 }
};
@ -1332,7 +1336,7 @@ doMacro(MacroBuf mb, rpmMacroEntry me, ARGV_t args, size_t *parsed)
int nargs = args && args[0] ? (argvCount(args) - 1) : 0;
int needarg = (me->nargs != 0);
int havearg = (nargs > 0);
if (needarg != havearg) {
if (me->nargs >= 0 && needarg != havearg) {
mbErr(mb, 1, "%%%s: %s\n", me->name, needarg ?
_("argument expected") : _("unexpected argument"));
goto exit;

7
tests/rpmmacro.at
View File

@ -850,12 +850,13 @@ AT_CHECK([
runroot rpm --eval '%{verbose}'
runroot rpm -v --eval '%{verbose}'
runroot rpm --eval '%{verbose:zzz}'
runroot rpm -v --eval '%{verbose:zzz}'
],
[1],
[0],
[0
1
],
[error: %verbose: unexpected argument
zzz
])
AT_CLEANUP