- updated for 4.4.8

[packages/rpm.git] / rpm-skip-backups.patch

diff --git a/rpm-skip-backups.patch b/rpm-skip-backups.patch
index a5c126da7a1b6dc85cbd8eb4f57062cd337dcda7..9ea9c3a8e63b13d327f371719a87ab706676b83a 100644 (file)
--- a/rpm-skip-backups.patch
+++ b/rpm-skip-backups.patch
@@ -1,11 +1,12 @@
 --- rpm-4.4.2/rpmio/macro.c~   2006-04-27 00:49:59.000000000 +0300
 +++ rpm-4.4.2/rpmio/macro.c    2006-04-27 00:50:04.000000000 +0300
-@@ -2000,8 +2000,15 @@
+@@ -2000,10 +2000,16 @@
            continue;
  
        /* Read macros from each file. */
--      for (i = 0; i < ac; i++)
+-      for (i = 0; i < ac; i++) {
 -          (void) rpmLoadMacroFile(mc, av[i]);
+-          av[i] = _free(av[i]);
 +      for (i = 0; i < ac; i++) {
 +          size_t slen = strlen(av[i]);
 +          if ((av[i])[slen-1] != '~' &&
@@ -14,7 +15,8 @@
 +                            strcmp((av[i] + slen - 8), ".rpmsave")))) {
 +              (void) rpmLoadMacroFile(mc, av[i]);
 +          }
-+      }
++          av[i] = _free(av[i]);
+       }
        av = _free(av);
      }
      mfiles = _free(mfiles);