From: Jim Meyering <jim@meyering.net>
Date: Sat, 18 Feb 2006 07:40:51 +0000 (+0000)
Subject: (sc_two_space_separator_in_usage): Make the regular
X-Git-Tag: v6.0~715
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6342e935251a161fb5a31941d3ab4c5049274e6;p=thirdparty%2Fcoreutils.git

(sc_two_space_separator_in_usage): Make the regular
expression match more of the target lines, e.g., those that start with
`-S,' (short option followed by a comma) or that include `=[...]'.
Patch by Nicolas François.
---

diff --git a/Makefile.maint b/Makefile.maint
index 455f4756cb..5837ff8d50 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -262,8 +262,12 @@ sc_trailing_blank:
 	  { echo '$(ME): found trailing blank(s)'			\
 		1>&2; exit 1; } || :
 
+# Match lines like the following, but where there is only one space
+# between the options and the description:
+#   -D, --all-repeated[=delimit-method]  print all duplicate lines\n
+longopt_re = --[a-z][0-9A-Za-z-]*(\[=[0-9A-Za-z-]*\])?
 sc_two_space_separator_in_usage:
-	@grep -n '^   *--[a-z][0-9A-Za-z-]* [^ ].*\\$$'			\
+	@grep -nE '^   *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$'		\
 	    $$($(CVS_LIST_EXCEPT)) &&					\
 	  { echo "$(ME): help2man requires at least two spaces between"; \
 	    echo "$(ME): an option and its description"; \