diff options
Diffstat (limited to 'modules/repofiles')
| -rw-r--r-- | modules/repofiles/update.go | 2 | ||||
| -rw-r--r-- | modules/repofiles/upload.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/repofiles/update.go b/modules/repofiles/update.go index 8a1e51730b..8e057700ab 100644 --- a/modules/repofiles/update.go +++ b/modules/repofiles/update.go @@ -385,7 +385,7 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up contentStore := &lfs.ContentStore{BasePath: setting.LFS.ContentPath} if !contentStore.Exists(lfsMetaObject) { if err := contentStore.Put(lfsMetaObject, strings.NewReader(opts.Content)); err != nil { - if err2 := repo.RemoveLFSMetaObjectByOid(lfsMetaObject.Oid); err2 != nil { + if _, err2 := repo.RemoveLFSMetaObjectByOid(lfsMetaObject.Oid); err2 != nil { return nil, fmt.Errorf("Error whilst removing failed inserted LFS object %s: %v (Prev Error: %v)", lfsMetaObject.Oid, err2, err) } return nil, err diff --git a/modules/repofiles/upload.go b/modules/repofiles/upload.go index 202e66b89a..a2e7cc927c 100644 --- a/modules/repofiles/upload.go +++ b/modules/repofiles/upload.go @@ -36,7 +36,7 @@ func cleanUpAfterFailure(infos *[]uploadInfo, t *TemporaryUploadRepository, orig continue } if !info.lfsMetaObject.Existing { - if err := t.repo.RemoveLFSMetaObjectByOid(info.lfsMetaObject.Oid); err != nil { + if _, err := t.repo.RemoveLFSMetaObjectByOid(info.lfsMetaObject.Oid); err != nil { original = fmt.Errorf("%v, %v", original, err) } } |