Fix some bugs

lunny · lunny · commit b6580de95fc3 · 2020-09-08T21:44:53.000+08:00
diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go
@@ -55,6 +55,9 @@ func (s *ContentStore) Put(meta *models.LFSMetaObject, r io.Reader) error {
 	}
 
 	if written != meta.Size {
+		if err := s.Delete(p); err != nil {
+			log.Error("Cleaning the LFS OID[%s] failed: %v", meta.Oid, err)
+		}
 		return errSizeMismatch
 	}
 
diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go
@@ -13,6 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/generate"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+
 	"github.com/unknwon/com"
 	ini "gopkg.in/ini.v1"
 )

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ func (s ContentStore) Put(meta models.LFSMetaObject, r io.Reader) error {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if written != meta.Size {`
	`58`	`+ if err := s.Delete(p); err != nil {`
	`59`	`+ log.Error("Cleaning the LFS OID[%s] failed: %v", meta.Oid, err)`
	`60`	`+ }`
`58`	`61`	`return errSizeMismatch`
`59`	`62`	`}`
`60`	`63`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`"code.gitea.io/gitea/modules/generate"`
`14`	`14`	`"code.gitea.io/gitea/modules/git"`
`15`	`15`	`"code.gitea.io/gitea/modules/log"`
	`16`	`+`
`16`	`17`	`"github.com/unknwon/com"`
`17`	`18`	`ini "gopkg.in/ini.v1"`
`18`	`19`	`)`