Revision 7079
Added by Aaron Marcuse-Kubitza almost 12 years ago
| input.Makefile | ||
|---|---|---|
| 371 | 371 |
|
| 372 | 372 |
trace = $(log_:.log.sql=.trace) |
| 373 | 373 |
import = -$(if $(profileTest),$(profileOnly),(set -x; "time" env commit=1\ |
| 374 |
$(if $(profile),profile_to=$(trace)) $(map2db))$(if $(log), 2>&1 >>$(log_)))
|
|
| 374 |
$(if $(profile),profile_to=$(trace)) $(map2db))$(if $(log), >>$(log_) 2>&1))
|
|
| 375 | 375 |
# don't abort on import errors, which often relate to invalid input data |
| 376 | 376 |
|
| 377 | 377 |
import? = $(if $(call and,$(public_import),$(call dontImport,.)),,$(import)) |
Also available in: Unified diff
input.Makefile: Import to VegBIEN: \$(import): Fixed bug where 2>&1 needs to come after >>$(log_) rather than before