diff options
| author | zeripath <art27@cantab.net> | 2021-07-15 16:46:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 11:46:07 -0400 |
| commit | 33a8eec33e975a74f1718a83e99eb6abc7662a19 (patch) | |
| tree | d000ff3f37d417e9d03d15d070ed6fecf9c56636 /models/repo.go | |
| parent | aed086f8b021f5724ff1449ceb9f44dc28749a97 (diff) | |
| download | gitea-33a8eec33e975a74f1718a83e99eb6abc7662a19.tar.gz gitea-33a8eec33e975a74f1718a83e99eb6abc7662a19.zip | |
Retry rename on lock induced failures (#16435)
* Retry rename on lock induced failures
Due to external locking on Windows it is possible for an
os.Rename to fail if the files or directories are being
used elsewhere.
This PR simply suggests retrying the rename again similar
to how we handle the os.Remove problems.
Fix #16427
Signed-off-by: Andrew Thornton <art27@cantab.net>
* resolve CI fail
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'models/repo.go')
| -rw-r--r-- | models/repo.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/repo.go b/models/repo.go index 143dff9ac3..d6abc1b5e3 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1227,7 +1227,7 @@ func ChangeRepositoryName(doer *User, repo *Repository, newRepoName string) (err } newRepoPath := RepoPath(repo.Owner.Name, newRepoName) - if err = os.Rename(repo.RepoPath(), newRepoPath); err != nil { + if err = util.Rename(repo.RepoPath(), newRepoPath); err != nil { return fmt.Errorf("rename repository directory: %v", err) } @@ -1238,7 +1238,7 @@ func ChangeRepositoryName(doer *User, repo *Repository, newRepoName string) (err return err } if isExist { - if err = os.Rename(wikiPath, WikiPath(repo.Owner.Name, newRepoName)); err != nil { + if err = util.Rename(wikiPath, WikiPath(repo.Owner.Name, newRepoName)); err != nil { return fmt.Errorf("rename repository wiki: %v", err) } } |