commit 9668011e7c0073e324ec04421764206075a495d6
Author: Jan Rękorajski <[email protected]>
Date: Sun Dec 7 22:23:57 2014 +0100
- fix rpm-ignore-missing-macro-files patch
rpm-ignore-missing-macro-files.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpm-ignore-missing-macro-files.patch
b/rpm-ignore-missing-macro-files.patch
index 43c48e4..f859bd1 100644
--- 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/9668011e7c0073e324ec04421764206075a495d6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
