changeset 16726:518ff78686bb

maint.mk: fix syntax checks without exclusions Commit 727075d0 skipped per-line exclusions if ${exclude} is left undefined, but was immediately broken by commit 44de969c which always initialized the variable to the empty string. * top/maint.mk (_sc_search_regexp): Allow for empty variable. Reported by Daniel P. Berrange. Signed-off-by: Eric Blake <eblake@redhat.com>
author Eric Blake <eblake@redhat.com>
date Thu, 29 Mar 2012 20:47:55 -0600
parents fb659d60019f
children 683cbe4ca79d
files ChangeLog top/maint.mk
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-29  Eric Blake  <eblake@redhat.com>
 
+	maint.mk: fix syntax checks without exclusions
+	* top/maint.mk (_sc_search_regexp): Allow for empty variable.
+	Reported by Daniel P. Berrange.
+
 	strerror_r: avoid compiler warning
 	* lib/strerror_r.c (strerror_r): Hoist extern declaration to top
 	level.
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -279,7 +279,7 @@
    if test -n "$$files"; then						\
      if test -n "$$prohibit"; then					\
        grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \
-         | grep -vE "$${exclude-^$$}"					\
+         | grep -vE "$${exclude:-^$$}"					\
          && { msg="$$halt" $(_sc_say_and_exit) } || :;			\
      else								\
        grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \