Only warn on errors in deleting LFS orphaned files during repo deletion (#7213)
This commit is contained in:
parent
0323122fd7
commit
cde410521c
2 changed files with 2 additions and 5 deletions
|
@ -63,7 +63,7 @@ func RemoveAllWithNotice(title, path string) {
|
|||
func removeAllWithNotice(e Engine, title, path string) {
|
||||
if err := os.RemoveAll(path); err != nil {
|
||||
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 {
|
||||
log.Error("CreateRepositoryNotice: %v", err)
|
||||
}
|
||||
|
|
|
@ -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)])
|
||||
err = os.Remove(filepath.Join(setting.LFS.ContentPath, oidPath))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
removeAllWithNotice(sess, "Delete orphaned LFS file", oidPath)
|
||||
}
|
||||
|
||||
if _, err := sess.Delete(&LFSMetaObject{RepositoryID: repoID}); err != nil {
|
||||
|
|
Reference in a new issue