From: Tom Clegg Date: Wed, 5 Jul 2017 15:32:35 +0000 (-0400) Subject: 11843: Improve formatting. X-Git-Tag: 1.1.0~151^2~1 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ef8ff20b1ede6f3eb583d93646a8eacbee461bab 11843: Improve formatting. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance index bccfdac0b8..7d16a69ae0 100755 --- a/sdk/cli/bin/arv-run-pipeline-instance +++ b/sdk/cli/bin/arv-run-pipeline-instance @@ -396,7 +396,10 @@ class WhRunPipelineInstance end end if !errors.empty? - abort "\n#{Time.now} -- pipeline_template #{@template[:uuid]}\nErrors:\n#{errors.collect { |c,p,e| "#{c}::#{p} - #{e}\n" }.join ""}" + all_errors = errors.collect do |c,p,e| + "#{c}::#{p} - #{e}\n" + end.join("") + abort "\n#{Time.now} -- pipeline_template #{@template[:uuid]}\nErrors:\n#{all_errors}" end debuglog "options=" + @options.pretty_inspect self @@ -657,7 +660,7 @@ class WhRunPipelineInstance @instance[:state] = 'Complete' else @instance[:state] = 'Paused' - end + end else if ended == @components.length or failed > 0 @instance[:state] = success ? 'Complete' : 'Failed'