Skip to content

Return error in doctor for authorized_keys and mergebase problems #10990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guillep2k merged 5 commits into from
Apr 8, 2020
Merged

Return error in doctor for authorized_keys and mergebase problems #10990

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6afa0d0
Return error for authorized_keys and mergebase problems
zeripath Apr 6, 2020
ae34142
Merge branch 'master' into doctor-two
zeripath Apr 6, 2020
6a96175
Merge branch 'master' into doctor-two
techknowlogick Apr 6, 2020
3efbea6
Merge branch 'master' into doctor-two
techknowlogick Apr 8, 2020
e32e097
Merge branch 'master' into doctor-two
techknowlogick Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/doctor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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))
}

Expand Down