Skip to content

Commit c1e575c

Browse files
zeripathjeffliu27
authored andcommitted
Only warn on errors in deleting LFS orphaned files during repo deletion (go-gitea#7213)
1 parent a2e1a2c commit c1e575c

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

models/admin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func RemoveAllWithNotice(title, path string) {
6363
func removeAllWithNotice(e Engine, title, path string) {
6464
if err := os.RemoveAll(path); err != nil {
6565
desc := fmt.Sprintf("%s [%s]: %v", title, path, err)
66-
log.Warn(desc)
66+
log.Warn(title+" [%s]: %v", path, err)
6767
if err = createNotice(e, NoticeRepository, desc); err != nil {
6868
log.Error("CreateRepositoryNotice: %v", err)
6969
}

models/repo.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,10 +1878,7 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
18781878
}
18791879

18801880
oidPath := filepath.Join(v.Oid[0:2], v.Oid[2:4], v.Oid[4:len(v.Oid)])
1881-
err = os.Remove(filepath.Join(setting.LFS.ContentPath, oidPath))
1882-
if err != nil {
1883-
return err
1884-
}
1881+
removeAllWithNotice(sess, "Delete orphaned LFS file", oidPath)
18851882
}
18861883

18871884
if _, err := sess.Delete(&LFSMetaObject{RepositoryID: repoID}); err != nil {

0 commit comments

Comments
 (0)