# HG changeset patch
# User Vladimir Marek <Vladimir.Marek@oracle.com>
# Date 1384958774 -3600
# Node ID adc592c67ee483f6d77dfd128399bd1e21f3f27a
# Parent  07e16b692d34bc5ede767bc16c8329a96eeb76b9
17747240 gmake setup is masking pkglint failures

diff -r 07e16b692d34 -r adc592c67ee4 components/Makefile
--- a/components/Makefile	Wed Jan 08 09:16:46 2014 -0800
+++ b/components/Makefile	Wed Nov 20 15:46:14 2013 +0100
@@ -108,10 +108,13 @@
 
 $(WS_LINT_CACHE):	$(WS_LOGS) tools
 ifdef CANONICAL_REPO
-	@echo "Generating pkglint(1) cache from $(CANONICAL_REPO)..."
+	@echo "Generating pkglint(1) cache from CANONICAL_REPO $(CANONICAL_REPO)..."
 	@(echo $(DUMMYPKG) | $(PKGLINT) \
 		-c $(WS_LINT_CACHE) -r $(CANONICAL_REPO) /dev/fd/0 \
-		>$(WS_LOGS)/naughty-canonical-repo-actions 2>&1 ; exit 0)
+		>$(WS_LOGS)/naughty-canonical-repo-actions 2>&1 || \
+		( echo "pkglint(1) failed, please see $(WS_LOGS)/naughty-canonical-repo-actions"; \
+		  exit 1 ) \
+	)
 else
 	$(MKDIR) $(WS_LINT_CACHE)
 endif