Skip to content

runCommand: Fix unnecessary nil check #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

runCommand: Fix unnecessary nil check #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,23 +589,22 @@ 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)
}
// wait guaranteed to be non-nil here.
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
}
Expand Down