- force rpm to prefer x32 color on x32

[packages/rpm.git] / rpm-ignore-missing-macro-files.patch

diff --git a/rpm-ignore-missing-macro-files.patch b/rpm-ignore-missing-macro-files.patch
index 43c48e47ea60e19fbc3856d1f53464f0bd79a009..f859bd1670fdb1d549ef3b198b8ca70f45e739ac 100644 (file)
--- a/rpm-ignore-missing-macro-files.patch
+++ b/rpm-ignore-missing-macro-files.patch
@@ -7,11 +7,11 @@
 -              rc |= rpmLoadMacroFile(mc, argv[i], nesting - 1);
 +              /* Skip backups, non existing files and %config leftovers. */
 +#define       _suffix(_s, _x) \
-+    (slen >= sizeof(_x) && !strcmp((_s)+slen-(sizeof(_x)-1), (_x)))
-+              if (!(_suffix(fn, "~")
-+                 || _suffix(fn, ".rpmnew")
-+                 || _suffix(fn, ".rpmorig")
-+                 || _suffix(fn, ".rpmsave"))
++    (strlen(_s) >= sizeof(_x) && !strcmp((_s)+strlen(_s)-(sizeof(_x)-1), (_x)))
++              if (!(_suffix(argv[i], "~")
++                 || _suffix(argv[i], ".rpmnew")
++                 || _suffix(argv[i], ".rpmorig")
++                 || _suffix(argv[i], ".rpmsave"))
 +                 && !Access(argv[i], R_OK)
 +                 )
 +                  rc |= rpmLoadMacroFile(mc, argv[i], nesting - 1);