Don't read *.rpmnew etc macro files

(transplanted from ae24df9cdc383c7244543d1af23191929792c8c7)

diff --git a/rpmio/macro.c b/rpmio/macro.c
index 4f9be07..cf79c9c 100644 (file)
--- 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]);
        }