lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always wait for the cmd to finish (#14006) 

After cancelling the context we still need to wait for the
command to finish otherwise zombie processes may occur

Fix #13987

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
release/v1.15
zeripath 2020-12-17 11:50:21 +00:00 committed by GitHub
parent 5e09de174c
commit 80a299d307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/git/command.go
View File

@ -153,6 +153,7 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
err := fn(ctx, cancel) err := fn(ctx, cancel)
if err != nil { if err != nil {
cancel() cancel()
_ = cmd.Wait()
return err return err
} }
} }