aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/ipc
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-06-30 13:21:47 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-06-30 13:21:47 +0200
commit906b9e38f1042fb822a8b568e3633b575a8bc71d (patch)
tree9551de9a5ac1660e7c9b38049f6b20514c90f7b3 /pkg/ipc
parent1d788bb883908c3db498a3e4c79b83443ac3aeab (diff)
pkg/ipc: don't consider hang as failure
Diffstat (limited to 'pkg/ipc')
-rw-r--r--pkg/ipc/ipc.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/ipc/ipc.go b/pkg/ipc/ipc.go
index 65e883acf..72a74f160 100644
--- a/pkg/ipc/ipc.go
+++ b/pkg/ipc/ipc.go
@@ -831,11 +831,11 @@ func (c *command) exec(opts *ExecOpts, progData []byte) (output []byte, failed,
output = <-c.readDone
if err := c.wait(); <-hang {
hanged = true
- // In all likelihood, this will be duplicated by the default
- // case below, but that's fine.
output = append(output, []byte(err.Error())...)
output = append(output, '\n')
- } else if exitStatus == -1 {
+ return
+ }
+ if exitStatus == -1 {
exitStatus = osutil.ProcessExitStatus(c.cmd.ProcessState)
if exitStatus == 0 {
exitStatus = statusRetry // fuchsia always returns wrong exit status 0