mirror of
https://github.com/jesseduffield/lazydocker.git
synced 2026-07-25 08:31:03 +00:00
Return error with stderr value
To maintain existing behaviour when not capturing stdout and stderr
This commit is contained in:
parent
5d5ca0d3c4
commit
b22b4801af
1 changed files with 5 additions and 4 deletions
|
|
@ -115,11 +115,12 @@ func sanitisedCommandOutput(output []byte, err error) (string, error) {
|
||||||
outputString := string(output)
|
outputString := string(output)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// errors like 'exit status 1' are not very useful so we'll create an error
|
// errors like 'exit status 1' are not very useful so we'll create an error
|
||||||
// from the combined output
|
// from stderr if we got an ExitError
|
||||||
if outputString == "" {
|
exitError, ok := err.(*exec.ExitError)
|
||||||
return "", WrapError(err)
|
if ok {
|
||||||
|
return outputString, errors.New(string(exitError.Stderr))
|
||||||
}
|
}
|
||||||
return outputString, errors.New(outputString)
|
return "", WrapError(err)
|
||||||
}
|
}
|
||||||
return outputString, nil
|
return outputString, nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue