fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-23 05:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #320

Browse source 
Suppress the error when we're removing a file that may not exist
This commit is contained in:
Bwko 2016-12-03 22:31:54 +01:00
parent c8f300b2cd
commit 0118b275b6
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
models/pull.go
View file

@ -712,9 +712,8 @@ func (pr *PullRequest) PushToBaseRepo() (err error) {
// Remove head in case there is a conflict. // Remove head in case there is a conflict.
file := path.Join(pr.BaseRepo.RepoPath(), headFile) file := path.Join(pr.BaseRepo.RepoPath(), headFile)
if err := os.Remove(file); err != nil { _ = os.Remove(file)
return fmt.Errorf("Fail to remove dir %s: %v", path.Join(pr.BaseRepo.RepoPath(), headFile), err)
}
if err = git.Push(headRepoPath, tmpRemoteName, fmt.Sprintf("%s:%s", pr.HeadBranch, headFile)); err != nil { if err = git.Push(headRepoPath, tmpRemoteName, fmt.Sprintf("%s:%s", pr.HeadBranch, headFile)); err != nil {
return fmt.Errorf("Push: %v", err) return fmt.Errorf("Push: %v", err)
} }

4
models/wiki.go
View file

@ -125,9 +125,7 @@ func (repo *Repository) updateWikiPage(doer *User, oldTitle, title, content, mes
// So we want to make sure the symlink is removed before write anything. // So we want to make sure the symlink is removed before write anything.
// The new file we created will be in normal text format. // The new file we created will be in normal text format.
if err := os.Remove(filename); err != nil { _ = os.Remove(filename)
return fmt.Errorf("Fail to remove %s: %v", filename, err)
}
if err = ioutil.WriteFile(filename, []byte(content), 0666); err != nil { if err = ioutil.WriteFile(filename, []byte(content), 0666); err != nil {
return fmt.Errorf("WriteFile: %v", err) return fmt.Errorf("WriteFile: %v", err)