Project

General

Profile

« Previous | Next » 

Revision 3382

input.Makefile: Import to VegBIEN: $(import): Only redirect stderr to stdout if outputting to a log file. This allows unlogged imports to redirect the "Inserted # new rows into database" message, which is output to stdout rather than stderr for use by validation and automated testing, to a separate location.

View differences:

input.Makefile
267 267
trace = $(log_:.log.sql=.trace)
268 268
import = -$(if $(profileTest),$(profileOnly),(set -x; "time" env commit=1\
269 269
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(log),\
270
$(if $(n),,>>$(log_))) 2>&1$(if $(log),$(if $(n),|tee -a $(log_))))
270
$(if $(n),,&>>$(log_)))$(if $(log),$(if $(n), 2>&1|tee -a $(log_))))
271 271
# don't abort on import errors, which often relate to invalid input data
272 272

  
273 273
import: $(addprefix import-,$(tables)) _always ;

Also available in: Unified diff