From 81d3942bf0017a92a8e3bab558f2194acff438d2 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 22 Oct 2020 07:46:18 +0200 Subject: [PATCH] Migrations: Gitea should not fail just because of no apiConfig return (#13229) * close #13227 * log it :+1: Co-authored-by: zeripath Co-authored-by: zeripath Co-authored-by: techknowlogick --- modules/migrations/gitea_downloader.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/migrations/gitea_downloader.go b/modules/migrations/gitea_downloader.go index 827cbef5c..8299c040b 100644 --- a/modules/migrations/gitea_downloader.go +++ b/modules/migrations/gitea_downloader.go @@ -101,12 +101,13 @@ func NewGiteaDownloader(ctx context.Context, baseURL, repoPath, username, passwo // set small maxPerPage since we can only guess // (default would be 50 but this can differ) maxPerPage := 10 - // new gitea instances can tell us what maximum they have - if giteaClient.CheckServerVersionConstraint(">=1.13.0") == nil { - apiConf, _, err := giteaClient.GetGlobalAPISettings() - if err != nil { - return nil, err - } + // gitea instances >=1.13 can tell us what maximum they have + apiConf, _, err := giteaClient.GetGlobalAPISettings() + if err != nil { + log.Info("Unable to get global API settings. Ignoring these.") + log.Debug("giteaClient.GetGlobalAPISettings. Error: %v", err) + } + if apiConf != nil { maxPerPage = apiConf.MaxResponseItems }