From 8a1778301bffaf46abbce5cb76c1add47bd241a0 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sat, 15 Feb 2014 15:07:50 -0800 Subject: [PATCH] Engine: clearer job error reporting * Job.Error and Job.Errorf always print a newline. * Avoid redundant prefixing of error messages. Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) --- engine/job.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/job.go b/engine/job.go index 1f35ac85ff..8e478f5053 100644 --- a/engine/job.go +++ b/engine/job.go @@ -74,7 +74,7 @@ func (job *Job) Run() error { return err } if job.status != 0 { - return fmt.Errorf("%s: %s", job.Name, errorMessage) + return fmt.Errorf("%s", errorMessage) } return nil } @@ -197,11 +197,14 @@ func (job *Job) Printf(format string, args ...interface{}) (n int, err error) { } func (job *Job) Errorf(format string, args ...interface{}) Status { + if format[len(format)-1] != '\n' { + format = format + "\n" + } fmt.Fprintf(job.Stderr, format, args...) return StatusErr } func (job *Job) Error(err error) Status { - fmt.Fprintf(job.Stderr, "%s", err) + fmt.Fprintf(job.Stderr, "%s\n", err) return StatusErr }