maint.mk: relax a regexp to accommodate other formatting styles

* top/maint.mk (sc_unmarked_diagnostics): Allow 0 or 1 space
between "ngettext" and the following "(".

diff --git a/ChangeLog b/ChangeLog
index df4b52c40e211f0d9405a9dcbc6cd2699e16f4d4..ba7252ab83a1dac7c01f36e7903b41959bc9f188 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-11  Jim Meyering  <meyering@redhat.com>
+
+       maint.mk: relax a regexp to accommodate other formatting styles
+       * top/maint.mk (sc_unmarked_diagnostics): Allow 0 or 1 space
+       between "ngettext" and the following "(".
+

 2011-03-11  Pádraig Brady <P@draigBrady.com>
 
        maint.mk: suppress a false positive warning
 2011-03-11  Pádraig Brady <P@draigBrady.com>
 
        maint.mk: suppress a false positive warning

diff --git a/top/maint.mk b/top/maint.mk
index 76741adf66c97d41169f81de2f37b65c3d158777..303e9c12fd275ff51b4ef9c235534b672bd1e749 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -659,7 +659,7 @@ sc_two_space_separator_in_usage:
 sc_unmarked_diagnostics:
        @grep -nE                                                       \
            '\<error *\([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT))      \
 sc_unmarked_diagnostics:
        @grep -nE                                                       \
            '\<error *\([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT))      \

-         | grep -Ev '(_|ngettext )\(' &&                               \
+         | grep -Ev '(_|ngettext ?)\(' &&                              \

          { echo '$(ME): found unmarked diagnostic(s)' 1>&2;            \
            exit 1; } || :
 
          { echo '$(ME): found unmarked diagnostic(s)' 1>&2;            \
            exit 1; } || :