From ccf453bdfe79ed7208267275c1abeb3ed95d70b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Fri, 28 Jan 2022 14:54:00 +0000 Subject: [PATCH] maintainer-makefile: fix sc_error_message_uppercase false failure * top/maint.mk (sc_error_message_uppercase): Don't trigger for any of the PRI... defines. Note we add an extra constraint here that PRI always follows a double quote, but that's almost always the case, or can be easily made so by prepending "" for example. --- ChangeLog | 6 ++++++ top/maint.mk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8d5c8520f1..02fe72d7bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-01-28 Pádraig Brady + + maintainer-makefile: fix sc_error_message_uppercase false failure + * top/maint.mk (sc_error_message_uppercase): Don't trigger for + any of the PRI... defines. + 2022-01-27 Paul Eggert maint: Update copyright notices diff --git a/top/maint.mk b/top/maint.mk index 344acb2af6..92cef425cf 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -473,7 +473,7 @@ sc_error_message_uppercase: @$(VC_LIST_EXCEPT) \ | xargs $(GREP) -nEA2 '[^rp]error *\(' /dev/null \ | $(GREP) -E '"[A-Z]' \ - | $(GREP) -vE '"FATAL|"WARNING|"Java|"C#|PRIuMAX' \ + | $(GREP) -vE '"FATAL|"WARNING|"Java|"C#|"PRI' \ && { echo '$(ME): found capitalized error message' 1>&2; \ exit 1; } \ || : -- 2.39.5