From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 30 Aug 2007 10:02:12 +0000 (+0300)
Subject: Don't read *.rpmnew etc macro files
X-Git-Tag: rpm-4.6.0-rc1~1968^2~18^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d0ad625b9cdab9f551712bd6fd44d8dff49a16a;p=platform%2Fupstream%2Frpm.git

Don't read *.rpmnew etc macro files
---

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