--- a/components/Makefile	Wed Jan 08 04:07:50 2014 -0800
+++ b/components/Makefile	Wed Nov 20 15:46:56 2013 +0100
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../make-rules/shared-macros.mk
@@ -98,10 +98,13 @@
 
 $(WS_LINT_CACHE):	$(WS_LOGS)
 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