netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9634 from btw616:fix-executeCombinedOutput

Browse Source 
PiperOrigin-RevId: 579917168
This commit is contained in:
gVisor bot
2023-11-06 12:06:51 -08:00
parent c2dd6140f4 1cca30c532
commit e018a7060c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/container/container_test.go
+6 -4
View File
@@ -98,11 +98,13 @@ func executeCombinedOutput(conf *config.Config, cont *Container, execFile *os.Fi
if err != nil {
return nil, err
}
if ws != 0 {
return nil, fmt.Errorf("exec failed, status: %v", ws)
}
out, err := ioutil.ReadAll(r)
switch {
case ws != 0 && err != nil:
err = fmt.Errorf("exec failed, status: %v, ioutil.ReadAll failed: %v", ws, err)
case ws != 0:
err = fmt.Errorf("exec failed, status: %v", ws)
}
return out, err
}