From 089b34858ce1ce3101b13fa8e14e4e56e0a02a90 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 8 Apr 2020 06:04:19 +0100 Subject: [PATCH] Return error for authorized_keys and mergebase problems (#10990) Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick --- cmd/doctor.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/doctor.go b/cmd/doctor.go index 3b0b5c9e9..f469496cf 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -353,7 +353,7 @@ func runDoctorAuthorizedKeys(ctx *cli.Context) ([]string, error) { if ctx.Bool("fix") { return []string{"authorized_keys is out of date, attempting regeneration"}, models.RewriteAllPublicKeys() } - return []string{"authorized_keys is out of date and should be regenerated with gitea admin regenerate keys"}, nil + return nil, fmt.Errorf(`authorized_keys is out of date and should be regenerated with "gitea admin regenerate keys" or "gitea doctor --run authorized_keys --fix"`) } return nil, nil } @@ -479,6 +479,9 @@ func runDoctorPRMergeBase(ctx *cli.Context) ([]string, error) { if ctx.Bool("fix") { results = append(results, fmt.Sprintf("%d PR mergebases updated of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)) } else { + if numPRsUpdated > 0 && err == nil { + return results, fmt.Errorf("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos) + } results = append(results, fmt.Sprintf("%d PRs with incorrect mergebases of %d PRs total in %d repos", numPRsUpdated, numPRs, numRepos)) }