diff options
| author | zeripath <art27@cantab.net> | 2020-08-11 21:05:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 21:05:34 +0100 |
| commit | 74bd9691c685942798f2761607731697498ceeae (patch) | |
| tree | 531d661263b839ccf8aa6af73bfb6710984f0dd9 /models/migrations | |
| parent | faa676cc8b4419ac56fbf9d009ea8c6b79834024 (diff) | |
| download | gitea-74bd9691c685942798f2761607731697498ceeae.tar.gz gitea-74bd9691c685942798f2761607731697498ceeae.zip | |
Re-attempt to delete temporary upload if the file is locked by another process (#12447)
Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util.
Fix #12339
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'models/migrations')
| -rw-r--r-- | models/migrations/v112.go | 4 | ||||
| -rw-r--r-- | models/migrations/v115.go | 5 | ||||
| -rw-r--r-- | models/migrations/v96.go | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/models/migrations/v112.go b/models/migrations/v112.go index 76d9933689..7e80037700 100644 --- a/models/migrations/v112.go +++ b/models/migrations/v112.go @@ -6,10 +6,10 @@ package migrations import ( "fmt" - "os" "path" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "xorm.io/builder" "xorm.io/xorm" @@ -31,7 +31,7 @@ func removeAttachmentMissedRepo(x *xorm.Engine) error { for i := 0; i < len(attachments); i++ { uuid := attachments[i].UUID - if err = os.RemoveAll(path.Join(setting.AttachmentPath, uuid[0:1], uuid[1:2], uuid)); err != nil { + if err = util.RemoveAll(path.Join(setting.AttachmentPath, uuid[0:1], uuid[1:2], uuid)); err != nil { fmt.Printf("Error: %v", err) } } diff --git a/models/migrations/v115.go b/models/migrations/v115.go index 9b5c70a7ac..fe3b086119 100644 --- a/models/migrations/v115.go +++ b/models/migrations/v115.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "xorm.io/xorm" ) @@ -110,8 +111,8 @@ func renameExistingUserAvatarName(x *xorm.Engine) error { log.Info("Deleting %d old avatars ...", deleteCount) i := 0 for file := range deleteList { - if err := os.Remove(file); err != nil { - log.Warn("os.Remove: %v", err) + if err := util.Remove(file); err != nil { + log.Warn("util.Remove: %v", err) } i++ select { diff --git a/models/migrations/v96.go b/models/migrations/v96.go index 9840248f61..5decb832cd 100644 --- a/models/migrations/v96.go +++ b/models/migrations/v96.go @@ -5,10 +5,10 @@ package migrations import ( - "os" "path" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "xorm.io/xorm" ) @@ -58,7 +58,7 @@ func deleteOrphanedAttachments(x *xorm.Engine) error { } for _, attachment := range attachements { - if err := os.RemoveAll(AttachmentLocalPath(attachment.UUID)); err != nil { + if err := util.RemoveAll(AttachmentLocalPath(attachment.UUID)); err != nil { return err } } |