From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 27 May 2009 02:50:53 +0000 (+0000)
Subject: improve error message output of metadata scan - fix newline break and do not hide... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/33a797591658098f0b096190c89b97a97c54b73c

improve error message output of metadata scan - fix newline break and do not hide broken makefiles after the first invocation anymore

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16101 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/scan.mk b/include/scan.mk
index 1cf45e58b..288a10050 100644
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -27,7 +27,7 @@ define PackageDir
 	{ \
 		$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
 		echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(2)/Makefile" >&2; \
+		$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null || { $$(call progress,ERROR: please fix $(SCAN_DIR)/$(2)/Makefile\n) rm -f $$@; }; \
 		echo; \
 	} > $$@ || true
 endef
@@ -62,7 +62,7 @@ $(TARGET_STAMP)::
 
 $(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
 	$(call progress,Collecting $(SCAN_NAME) info: merging...)
-	cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@
+	-cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 2>/dev/null
 	$(call progress,Collecting $(SCAN_NAME) info: done)
 	echo