diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-05-27 02:50:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-05-27 02:50:53 +0000 |
| commit | db4fd873f3a105bad8e4a6d390d5d4655430da89 (patch) | |
| tree | c468e204a83ef4795a5ae26a6fa03187cc13b427 | |
| parent | f4e312ddf855375667f43c842c7187934b8aca92 (diff) | |
| download | upstream-db4fd873f3a105bad8e4a6d390d5d4655430da89.tar.gz upstream-db4fd873f3a105bad8e4a6d390d5d4655430da89.tar.bz2 upstream-db4fd873f3a105bad8e4a6d390d5d4655430da89.zip | |
improve error message output of metadata scan - fix newline break and do not hide broken makefiles after the first invocation anymore
SVN-Revision: 16101
| -rw-r--r-- | include/scan.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scan.mk b/include/scan.mk index 1cf45e58b6..288a10050b 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 |