diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-01-07 12:04:53 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-01-07 12:04:53 +0200 |
| commit | c16cde7a4df73af0ea2a5eda07a65d838833274b (patch) | |
| tree | 13b573322f185aa98da3a7fca2c43aa0b17fe694 /rpmio | |
| parent | 05b2d979e8097d648f91c773f2535a1f6013cb79 (diff) | |
| download | rpm-c16cde7a4df73af0ea2a5eda07a65d838833274b.tar.gz rpm-c16cde7a4df73af0ea2a5eda07a65d838833274b.tar.bz2 rpm-c16cde7a4df73af0ea2a5eda07a65d838833274b.zip | |
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.
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/macro.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |