Browse Source

fix delete correct temp directory (#5839)

tags/v1.21.12.1
yasuokav techknowlogick 6 years ago
parent
commit
d663930023
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      models/pull.go

+ 1
- 1
models/pull.go View File

@@ -396,7 +396,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err)
}

defer os.RemoveAll(path.Dir(tmpBasePath))
defer os.RemoveAll(tmpBasePath)

var stderr string
if _, stderr, err = process.GetManager().ExecTimeout(5*time.Minute,


Loading…
Cancel
Save