lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug of migrated repository not index (#16991) (#16996) 

Fix #16986, #16152

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
release/v1.15
6543 2021-09-09 08:02:22 +02:00 committed by GitHub
parent d27f061863
commit 3b13c5d41a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/task/migrate.go
View File

@ -93,7 +93,6 @@ func runMigrateTask(t *models.Task) (err error) {
} }
opts.MigrateToRepoID = t.RepoID opts.MigrateToRepoID = t.RepoID
var repo *models.Repository
ctx, cancel := context.WithCancel(graceful.GetManager().ShutdownContext()) ctx, cancel := context.WithCancel(graceful.GetManager().ShutdownContext())
defer cancel() defer cancel()
@ -107,7 +106,7 @@ func runMigrateTask(t *models.Task) (err error) {
return return
} }
repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts, func(format string, args ...interface{}) { t.Repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts, func(format string, args ...interface{}) {
message := models.TranslatableMessage{ message := models.TranslatableMessage{
Format: format, Format: format,
Args: args, Args: args,
@ -118,7 +117,7 @@ func runMigrateTask(t *models.Task) (err error) {
_ = t.UpdateCols("message") _ = t.UpdateCols("message")
}) })
if err == nil { if err == nil {
log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name) log.Trace("Repository migrated [%d]: %s/%s", t.Repo.ID, t.Owner.Name, t.Repo.Name)
return return
} }