diff options
Diffstat (limited to 'rpmio/macro.c')
| -rw-r--r-- | rpmio/macro.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rpmio/macro.c b/rpmio/macro.c index 7858b10b2..0afdc047d 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -421,6 +421,10 @@ doShellEscape(MacroBuf mb, const char * cmd, size_t clen) FILE *shf; int c; +#ifdef WITH_LUA + rpmlog(RPMLOG_WARNING, _("Refusing to run shell code: %s\n"), cmd); + mbAppendStr(mb, "UNEXPANDEDSHELLSCRIPT"); +#else if (expandThis(mb, cmd, clen, &buf)) goto exit; @@ -443,6 +447,7 @@ doShellEscape(MacroBuf mb, const char * cmd, size_t clen) exit: _free(buf); +#endif } /** @@ -1221,7 +1226,7 @@ expandMacro(MacroBuf mb, const char *src, size_t slen) int loglevel = RPMLOG_NOTICE; /* assume echo */ if (STREQ("error", f, fn)) { loglevel = RPMLOG_ERR; - mb->error = 1; + mb->error = 0; } else if (STREQ("warn", f, fn)) { loglevel = RPMLOG_WARNING; } |