From 74bd9691c685942798f2761607731697498ceeae Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 11 Aug 2020 21:05:34 +0100 Subject: Re-attempt to delete temporary upload if the file is locked by another process (#12447) Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util. Fix #12339 Signed-off-by: Andrew Thornton Co-authored-by: silverwind --- services/pull/patch.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services/pull/patch.go') diff --git a/services/pull/patch.go b/services/pull/patch.go index 776bfdb751..9b894b781c 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" ) // DownloadDiffOrPatch will write the patch for the pr to the writer @@ -80,7 +81,7 @@ func TestPatch(pr *models.PullRequest) error { return fmt.Errorf("Unable to create temporary patch file! Error: %v", err) } defer func() { - _ = os.Remove(tmpPatchFile.Name()) + _ = util.Remove(tmpPatchFile.Name()) }() if err := gitRepo.GetDiff(pr.MergeBase, "tracking", tmpPatchFile); err != nil { -- cgit v1.2.3