Changeset 16101


Ignore:
Timestamp:
2009-05-27T04:50:53+02:00 (7 years ago)
Author:
nbd
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/scan.mk

    r14736 r16101  
    2828                $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \ 
    2929                echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \ 
    30                 $(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; \ 
     30                $(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 $$@; }; \ 
    3131                echo; \ 
    3232        } > $$@ || true 
     
    6363$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP) 
    6464        $(call progress,Collecting $(SCAN_NAME) info: merging...) 
    65         cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 
     65        -cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 2>/dev/null 
    6666        $(call progress,Collecting $(SCAN_NAME) info: done) 
    6767        echo 
Note: See TracChangeset for help on using the changeset viewer.