From: Jim Meyering <meyering@redhat.com>
Date: Fri, 11 Mar 2011 10:44:12 +0000 (+0100)
Subject: maint.mk: relax a regexp to accommodate other formatting styles
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e683a8ac281808e3c4926bba0aede3470b45ec7;p=pspp

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 df4b52c40e..ba7252ab83 100644
--- 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
diff --git a/top/maint.mk b/top/maint.mk
index 76741adf66..303e9c12fd 100644
--- 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))	\
-	  | grep -Ev '(_|ngettext )\(' &&				\
+	  | grep -Ev '(_|ngettext ?)\(' &&				\
 	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
 	    exit 1; } || :