Skip to content

Commit 59d6401

Browse files
authored
Use ioutil.TmpDir for new created temp directory (#9368)
* Use os.TmpDir for new created temp directory * fix error message
1 parent 43ada65 commit 59d6401

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

models/repo.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,13 +1198,11 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C
11981198
return err
11991199
}
12001200

1201-
tmpDir := filepath.Join(os.TempDir(), "gitea-"+repo.Name+"-"+com.ToStr(time.Now().Nanosecond()))
1202-
12031201
// Initialize repository according to user's choice.
12041202
if opts.AutoInit {
1205-
1206-
if err := os.MkdirAll(tmpDir, os.ModePerm); err != nil {
1207-
return fmt.Errorf("Failed to create dir %s: %v", tmpDir, err)
1203+
tmpDir, err := ioutil.TempDir(os.TempDir(), "gitea-"+repo.Name)
1204+
if err != nil {
1205+
return fmt.Errorf("Failed to create temp dir for repository %s: %v", repo.repoPath(e), err)
12081206
}
12091207

12101208
defer os.RemoveAll(tmpDir)

models/repo_generate.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,9 @@ func generateRepoCommit(e Engine, repo, templateRepo, generateRepo *Repository,
179179

180180
// generateRepository initializes repository from template
181181
func generateRepository(e Engine, repo, templateRepo, generateRepo *Repository) (err error) {
182-
tmpDir := filepath.Join(os.TempDir(), "gitea-"+repo.Name+"-"+com.ToStr(time.Now().Nanosecond()))
183-
184-
if err := os.MkdirAll(tmpDir, os.ModePerm); err != nil {
185-
return fmt.Errorf("Failed to create dir %s: %v", tmpDir, err)
182+
tmpDir, err := ioutil.TempDir(os.TempDir(), "gitea-"+repo.Name)
183+
if err != nil {
184+
return fmt.Errorf("Failed to create temp dir for repository %s: %v", repo.repoPath(e), err)
186185
}
187186

188187
defer func() {

services/pull/check.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import (
1010
"fmt"
1111
"io/ioutil"
1212
"os"
13-
"path/filepath"
14-
"strconv"
1513
"strings"
16-
"time"
1714

1815
"code.gitea.io/gitea/models"
1916
"code.gitea.io/gitea/modules/git"
@@ -67,13 +64,16 @@ func getMergeCommit(pr *models.PullRequest) (*git.Commit, error) {
6764
}
6865
}
6966

70-
indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
71-
defer os.Remove(indexTmpPath)
67+
indexTmpPath, err := ioutil.TempDir(os.TempDir(), "gitea-"+pr.BaseRepo.Name)
68+
if err != nil {
69+
return nil, fmt.Errorf("Failed to create temp dir for repository %s: %v", pr.BaseRepo.RepoPath(), err)
70+
}
71+
defer os.RemoveAll(indexTmpPath)
7272

7373
headFile := pr.GetGitRefName()
7474

7575
// Check if a pull request is merged into BaseBranch
76-
_, err := git.NewCommand("merge-base", "--is-ancestor", headFile, pr.BaseBranch).RunInDirWithEnv(pr.BaseRepo.RepoPath(), []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()})
76+
_, err = git.NewCommand("merge-base", "--is-ancestor", headFile, pr.BaseBranch).RunInDirWithEnv(pr.BaseRepo.RepoPath(), []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()})
7777
if err != nil {
7878
// Errors are signaled by a non-zero status that is not 1
7979
if strings.Contains(err.Error(), "exit status 1") {

0 commit comments

Comments
 (0)