diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-30 21:07:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-30 21:07:14 +0300 |
| commit | 9e7f94a7408534411dc8da69c9e3ad3a55722b51 (patch) | |
| tree | baf917b2ab176390258c3a6a282b3b2432d4469c /workhorse/internal/artifacts/entry.go | |
| parent | 826cf5293fb78029f76c5e769696e3b37e681207 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/artifacts/entry.go')
| -rw-r--r-- | workhorse/internal/artifacts/entry.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/workhorse/internal/artifacts/entry.go b/workhorse/internal/artifacts/entry.go index d5b3dfb672c..3ec3a559100 100644 --- a/workhorse/internal/artifacts/entry.go +++ b/workhorse/internal/artifacts/entry.go @@ -17,6 +17,7 @@ import ( "gitlab.com/gitlab-org/labkit/mask" "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" + "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper/command" "gitlab.com/gitlab-org/gitlab/workhorse/internal/senddata" "gitlab.com/gitlab-org/gitlab/workhorse/internal/zipartifacts" ) @@ -83,7 +84,7 @@ func unpackFileFromZip(ctx context.Context, archivePath, encodedFilename string, if err := catFile.Start(); err != nil { return fmt.Errorf("start %v: %v", catFile.Args, err) } - defer helper.CleanUpProcessGroup(catFile) + defer command.KillProcessGroup(catFile) basename := filepath.Base(fileName) reader := bufio.NewReader(stdout) @@ -114,7 +115,7 @@ func waitCatFile(cmd *exec.Cmd) error { return nil } - st, ok := helper.ExitStatus(err) + st, ok := command.ExitStatus(err) if ok && (st == zipartifacts.CodeArchiveNotFound || st == zipartifacts.CodeEntryNotFound) { return os.ErrNotExist |