]>
Commit | Line | Data |
---|---|---|
2d4b0aa2 ER |
1 | --- rpm-4.4.2/rpmio/macro.c~ 2006-04-27 00:49:59.000000000 +0300 |
2 | +++ rpm-4.4.2/rpmio/macro.c 2006-04-27 00:50:04.000000000 +0300 | |
3 | @@ -2000,8 +2000,15 @@ | |
4 | continue; | |
5 | ||
6 | /* Read macros from each file. */ | |
7 | - for (i = 0; i < ac; i++) | |
8 | - (void) rpmLoadMacroFile(mc, av[i]); | |
9 | + for (i = 0; i < ac; i++) { | |
10 | + size_t slen = strlen(av[i]); | |
11 | + if ((av[i])[slen-1] != '~' && | |
12 | + (slen < 8 || strcmp((av[i] + slen - 7), ".rpmnew")) && | |
13 | + (slen < 9 || (strcmp((av[i] + slen - 8), ".rpmorig") && | |
14 | + strcmp((av[i] + slen - 8), ".rpmsave")))) { | |
15 | + (void) rpmLoadMacroFile(mc, av[i]); | |
16 | + } | |
17 | + } | |
18 | av = _free(av); | |
19 | } | |
20 | mfiles = _free(mfiles); |