diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-08-30 13:02:12 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-08-30 13:02:12 +0300 |
| commit | 8d0ad625b9cdab9f551712bd6fd44d8dff49a16a (patch) | |
| tree | 188e223276fbc7aa5efcb393745d7a0abe06c14c /rpmio | |
| parent | db6eb7df2a6c94ddf70440ffb190041410587f04 (diff) | |
| download | rpm-8d0ad625b9cdab9f551712bd6fd44d8dff49a16a.tar.gz rpm-8d0ad625b9cdab9f551712bd6fd44d8dff49a16a.tar.bz2 rpm-8d0ad625b9cdab9f551712bd6fd44d8dff49a16a.zip | |
Don't read *.rpmnew etc macro files
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/macro.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rpmio/macro.c b/rpmio/macro.c index 4f9be0700..cf79c9c05 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -2014,6 +2014,11 @@ rpmInitMacros(MacroContext mc, const char * macrofiles) /* Read macros from each file. */ for (i = 0; i < ac; i++) { + if (strstr(av[i], ".rpmnew") || + strstr(av[i], ".rpmsave") || + strstr(av[i], ".rpmorig")) { + continue; + } (void) rpmLoadMacroFile(mc, av[i]); av[i] = _free(av[i]); } |