Project

General

Profile

« Previous | Next » 

Revision 7073

input.Makefile: Import to VegBIEN: $(import): Always output just to log file if $(log) is on, rather than also copying output to the terminal when $(n) is set. When $(log) is on, the output can still be viewed by tailing the log.

View differences:

input.Makefile
365 365
log_ = $*/logs/$(if $(n),n=$(n).,)$(version).log.sql
366 366
trace = $(log_:.log.sql=.trace)
367 367
import = -$(if $(profileTest),$(profileOnly),(set -x; "time" env commit=1\
368
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(log),\
369
$(if $(n), 2>&1|tee -a $(log_),&>$(log_))))
368
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(log),&>$(log_)))
370 369
# don't abort on import errors, which often relate to invalid input data
371 370

  
372 371
import? = $(if $(call and,$(public_import),$(call dontImport,.)),,$(import))

Also available in: Unified diff