From 906b9e38f1042fb822a8b568e3633b575a8bc71d Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 30 Jun 2018 13:21:47 +0200 Subject: pkg/ipc: don't consider hang as failure --- pkg/ipc/ipc.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/ipc') 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 -- cgit mrf-deployment