projects
/
platform
/
upstream
/
rpm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db6eb7d
)
Don't read *.rpmnew etc macro files
author
Panu Matilainen
<pmatilai@redhat.com>
Thu, 30 Aug 2007 10:02:12 +0000
(13:02 +0300)
committer
Panu Matilainen
<pmatilai@redhat.com>
Thu, 30 Aug 2007 10:02:12 +0000
(13:02 +0300)
rpmio/macro.c
patch
|
blob
|
history
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]);
}