lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only warn on errors in deleting LFS orphaned files during repo deletion (#7213)

release/v1.15
zeripath 2019-06-15 23:20:29 +01:00 committed by GitHub
parent 0323122fd7
commit cde410521c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/admin.go
View File

@ -63,7 +63,7 @@ func RemoveAllWithNotice(title, path string) {
func removeAllWithNotice(e Engine, title, path string) { func removeAllWithNotice(e Engine, title, path string) {
if err := os.RemoveAll(path); err != nil { if err := os.RemoveAll(path); err != nil {
desc := fmt.Sprintf("%s [%s]: %v", title, path, err) desc := fmt.Sprintf("%s [%s]: %v", title, path, err)
log.Warn(desc) log.Warn(title+" [%s]: %v", path, err)
if err = createNotice(e, NoticeRepository, desc); err != nil { if err = createNotice(e, NoticeRepository, desc); err != nil {
log.Error("CreateRepositoryNotice: %v", err) log.Error("CreateRepositoryNotice: %v", err)
} }

5
models/repo.go
View File

@ -1882,10 +1882,7 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
} }
oidPath := filepath.Join(v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)]) oidPath := filepath.Join(v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])
err = os.Remove(filepath.Join(setting.LFS.ContentPath, oidPath)) removeAllWithNotice(sess, "Delete orphaned LFS file", oidPath)
if err != nil {
return err
}
} }
if _, err := sess.Delete(&LFSMetaObject{RepositoryID: repoID}); err != nil { if _, err := sess.Delete(&LFSMetaObject{RepositoryID: repoID}); err != nil {