From de9d2d5bdd9277f473502bfec29a47d91461ff90 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 25 Mar 2024 08:26:09 +0000 Subject: [PATCH 1/2] fix --- services/doctor/fix16961.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/doctor/fix16961.go b/services/doctor/fix16961.go index d3f36d8d5cdfb..3f87ce9539b6c 100644 --- a/services/doctor/fix16961.go +++ b/services/doctor/fix16961.go @@ -249,6 +249,8 @@ func fixBrokenRepoUnit16961(repoUnit *repo_model.RepoUnit, bs []byte) (fixed boo if fixed, err := fixIssuesConfig16961(bs, cfg); !fixed { return false, err } + case unit.TypeActions: + // action unit is newly added, so skip here default: panic(fmt.Sprintf("unrecognized repo unit type: %v", repoUnit.Type)) } From 5a8fd8b254388f7af3eced60f42811b2f4b6819d Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 26 Mar 2024 00:56:13 +0000 Subject: [PATCH 2/2] fix --- services/doctor/fix16961.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/doctor/fix16961.go b/services/doctor/fix16961.go index 3f87ce9539b6c..50d9ac6621adc 100644 --- a/services/doctor/fix16961.go +++ b/services/doctor/fix16961.go @@ -216,6 +216,12 @@ func fixBrokenRepoUnit16961(repoUnit *repo_model.RepoUnit, bs []byte) (fixed boo return false, nil } + var cfg any + err = json.UnmarshalHandleDoubleEncode(bs, &cfg) + if err == nil { + return false, nil + } + switch repoUnit.Type { case unit.TypeCode, unit.TypeReleases, unit.TypeWiki, unit.TypeProjects: cfg := &repo_model.UnitConfig{} @@ -249,8 +255,6 @@ func fixBrokenRepoUnit16961(repoUnit *repo_model.RepoUnit, bs []byte) (fixed boo if fixed, err := fixIssuesConfig16961(bs, cfg); !fixed { return false, err } - case unit.TypeActions: - // action unit is newly added, so skip here default: panic(fmt.Sprintf("unrecognized repo unit type: %v", repoUnit.Type)) }