diff options
Diffstat (limited to 'src/cmd/internal/script')
| -rw-r--r-- | src/cmd/internal/script/engine.go | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/cmd/internal/script/engine.go b/src/cmd/internal/script/engine.go index 05b9433d3e..9480741c10 100644 --- a/src/cmd/internal/script/engine.go +++ b/src/cmd/internal/script/engine.go @@ -580,23 +580,21 @@ func (e *Engine) runCommand(s *State, cmd *command, impl Cmd) error { return nil } - if wait != nil { - stdout, stderr, waitErr := wait(s) - s.stdout = stdout - s.stderr = stderr - if stdout != "" { - s.Logf("[stdout]\n%s", stdout) - } - if stderr != "" { - s.Logf("[stderr]\n%s", stderr) - } - if cmdErr := checkStatus(cmd, waitErr); cmdErr != nil { - return cmdErr - } - if waitErr != nil { - // waitErr was expected (by cmd.want), so log it instead of returning it. - s.Logf("[%v]\n", waitErr) - } + stdout, stderr, waitErr := wait(s) + s.stdout = stdout + s.stderr = stderr + if stdout != "" { + s.Logf("[stdout]\n%s", stdout) + } + if stderr != "" { + s.Logf("[stderr]\n%s", stderr) + } + if cmdErr := checkStatus(cmd, waitErr); cmdErr != nil { + return cmdErr + } + if waitErr != nil { + // waitErr was expected (by cmd.want), so log it instead of returning it. + s.Logf("[%v]\n", waitErr) } return nil } |
