From c16cde7a4df73af0ea2a5eda07a65d838833274b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 7 Jan 2010 12:04:53 +0200 Subject: Revert "Always free locally defined macros when they go out of scope" - the "fix" breaks seemingly legitimate use in fedora font package macros, possibly some funky interaction with %{lua: } macros or something - this reverts commit f895acd285366cf58cc3c97b5f188fecbfd782a8. --- rpmio/macro.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'rpmio') diff --git a/rpmio/macro.c b/rpmio/macro.c index 11db47d60..88fb58362 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -1344,8 +1344,9 @@ expandMacro(MacroBuf mb) me->used++; /* Mark macro as used */ } - /* Free locally defined macros, such as macro options */ - freeArgs(mb); + /* Free args for "%name " macros with opts */ + if (me->opts != NULL) + freeArgs(mb); s = se; } -- cgit v1.2.3