]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-skip-backups.patch
- updated for 4.4.8
[packages/rpm.git] / rpm-skip-backups.patch
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,10 +2000,16 @@
4             continue;
5  
6         /* Read macros from each file. */
7 -       for (i = 0; i < ac; i++) {
8 -           (void) rpmLoadMacroFile(mc, av[i]);
9 -           av[i] = _free(av[i]);
10 +       for (i = 0; i < ac; i++) {
11 +           size_t slen = strlen(av[i]);
12 +           if ((av[i])[slen-1] != '~' &&
13 +               (slen < 8 || strcmp((av[i] + slen - 7), ".rpmnew")) &&
14 +               (slen < 9 || (strcmp((av[i] + slen - 8), ".rpmorig") &&
15 +                             strcmp((av[i] + slen - 8), ".rpmsave")))) {
16 +               (void) rpmLoadMacroFile(mc, av[i]);
17 +           }
18 +           av[i] = _free(av[i]);
19         }
20         av = _free(av);
21      }
22      mfiles = _free(mfiles);
This page took 0.043048 seconds and 3 git commands to generate.