[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] syntax: fix broken error message in previous patch



Osier Yang pointed out that I introduced a syntax error in my
syntax check (I really shouldn't make last-minute changes without
testing them....).

/bin/sh: -c: line 2: syntax error near unexpected token `;'
/bin/sh: -c: line 2: `  { echo 'maint.mk: incorrect whitespace, see HACKING for rules' 2>&; \'
make: *** [bracket-spacing-check] Error 1

* cfg.mk (bracket-spacing-check): Fix copy-and-paste error.
(sc_prohibit_duplicate_header): Use consistent spelling.

Signed-off-by: Eric Blake <eblake redhat com>
---

Pushing under the build-breaker rule.

 cfg.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index a01df56..4ffa020 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -779,7 +779,7 @@ sc_prohibit_duplicate_header:
 	  }' $$i || fail=1;						\
 	done;								\
 	if test $$fail -eq 1; then					\
-	  { echo "$(ME)": avoid duplicate headers >&2; exit 1; }	\
+	  { echo '$(ME): avoid duplicate headers' 1>&2; exit 1; }	\
 	fi;

 # Don't include "libvirt/*.h" in "" form.
@@ -845,7 +845,7 @@ syntax-check: $(top_srcdir)/HACKING bracket-spacing-check
 bracket-spacing-check:
 	$(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \
 	$(PERL) $(top_srcdir)/build-aux/bracket-spacing.pl $$files || \
-	  { echo "$(ME): incorrect whitespace, see HACKING for rules" 2>&; \
+	  { echo '$(ME): incorrect whitespace, see HACKING for rules' 1>&2; \
 	    exit 1; }

 # sc_po_check can fail if generated files are not built first
-- 
1.8.1.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]