From: Joe Stringer Date: Wed, 29 Apr 2015 20:33:25 +0000 (-0700) Subject: datapath: Tidy up duplicate symbol detection. X-Git-Tag: v2.4.0~258 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=46add523b379082f2784969ad47def0d602f0fe6;p=cascardo%2Fovs.git datapath: Tidy up duplicate symbol detection. Don't print each symbol that is iterated. Make the error message more clear by prefixing "error: ". Signed-off-by: Joe Stringer Acked-by: Ben Pfaff --- diff --git a/datapath/Makefile.am b/datapath/Makefile.am index a8e9be4b9..458fa5bb6 100644 --- a/datapath/Makefile.am +++ b/datapath/Makefile.am @@ -42,15 +42,15 @@ COMPAT_EXPORTS := $(shell $(COMPAT_GET_EXPORTS)) check-export-symbol: @for fun_ in $(COMPAT_FUNCTIONS); do \ if ! grep -- $${fun_} $(top_srcdir)/datapath/linux/compat/build-aux/export-check-whitelist > /dev/null; then \ - if ! echo $${fun_} | grep -E '^(rpl|ovs)_'; then \ - echo "Should prefix $${fun_} with rpl_ or ovs_."; \ + if ! echo $${fun_} | grep -q -E '^(rpl|ovs)_'; then \ + echo "error: $${fun_}() needs to be prefixed with 'rpl_' or 'ovs_'."; \ exit 1; \ fi; \ fi; \ done @for fun_ in $(COMPAT_EXPORTS); do \ - if ! echo $${fun_} | grep -E '^(rpl|ovs)_'; then \ - echo "Should prefix $${fun_} with rpl_ or ovs_."; \ + if ! echo $${fun_} | grep -q -E '^(rpl|ovs)_'; then \ + echo "error: $${fun_}() needs to be prefixed with 'rpl_' or 'ovs_'."; \ exit 1; \ fi; \ done