X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Frun%2Fcmd.go;h=8f3d6134b287702f8ae72a5f52be8d7bb25a89c2;hb=fd97e8019e2ab166d9475ed59782c86247d8430b;hp=4700ea3367806e434aae60878712002f88cf453e;hpb=f2f2bc47e8729548f3c10117f7f008b547c4afc5;p=safcm%2Fsafcm.git diff --git a/cmd/safcm-remote/run/cmd.go b/cmd/safcm-remote/run/cmd.go index 4700ea3..8f3d613 100644 --- a/cmd/safcm-remote/run/cmd.go +++ b/cmd/safcm-remote/run/cmd.go @@ -28,10 +28,10 @@ import ( type Cmd struct { Runner Runner - logger log.Logger + logger *log.Logger } -func NewCmd(runner Runner, logger log.Logger) *Cmd { +func NewCmd(runner Runner, logger *log.Logger) *Cmd { return &Cmd{ Runner: runner, logger: logger, @@ -62,7 +62,7 @@ func (c *Cmd) Run(module string, args ...string) ([]byte, []byte, error) { } if err != nil { return nil, nil, fmt.Errorf( - "%s failed: %s; stdout: %q, stderr: %q", + "%s failed: %v; stdout: %q, stderr: %q", quoted, err, stdout.String(), stderr.String()) } return stdout.Bytes(), stderr.Bytes(), nil @@ -78,7 +78,7 @@ func (c *Cmd) CombinedOutputCmd(module string, cmd *exec.Cmd) ([]byte, error) { c.logger.Debug2f("%s: command output:\n%s", module, out) } if err != nil { - return nil, fmt.Errorf("%s failed: %s; output: %q", + return nil, fmt.Errorf("%s failed: %v; output: %q", quoted, err, out) } return out, nil