From e79dae29cc2fcabc639ff27f28a9adf1fa07b28c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 22 Feb 2021 11:57:41 +0800 Subject: Fix repo-restore bug with poster not replaced (#14759) * Fix restore bug * Fix restore bug Co-authored-by: Lauris BH Co-authored-by: John Olheiser Co-authored-by: 6543 <6543@obermui.de> --- modules/migrations/restore.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'modules/migrations/restore.go') diff --git a/modules/migrations/restore.go b/modules/migrations/restore.go index e1ab408e41..4e63df1429 100644 --- a/modules/migrations/restore.go +++ b/modules/migrations/restore.go @@ -53,8 +53,7 @@ func (r *RepositoryRestorer) SetContext(ctx context.Context) { r.ctx = ctx } -// GetRepoInfo returns a repository information -func (r *RepositoryRestorer) GetRepoInfo() (*base.Repository, error) { +func (r *RepositoryRestorer) getRepoOptions() (map[string]string, error) { p := filepath.Join(r.baseDir, "repo.yml") bs, err := ioutil.ReadFile(p) if err != nil { @@ -66,6 +65,15 @@ func (r *RepositoryRestorer) GetRepoInfo() (*base.Repository, error) { if err != nil { return nil, err } + return opts, nil +} + +// GetRepoInfo returns a repository information +func (r *RepositoryRestorer) GetRepoInfo() (*base.Repository, error) { + opts, err := r.getRepoOptions() + if err != nil { + return nil, err + } isPrivate, _ := strconv.ParseBool(opts["is_private"]) -- cgit v1.2.3