particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd/osbuild-worker: dnf-json returns MarkingErrors (plural)

Browse source
This commit is contained in:
Sanne Raymaekers 2022-02-25 10:33:24 +01:00 • committed by Ondřej Budai
parent c64eb98011
commit 318a4525c6
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/osbuild-worker/jobimpl-depsolve.go
View file

@ -51,8 +51,8 @@ func (impl *DepsolveJobImpl) Run(job worker.Job) error {
switch e.Kind {
case "DepsolveError":
result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFDepsolveError, err.Error())
case "MarkingError":
result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFMarkingError, err.Error())
case "MarkingErrors":
result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFMarkingErrors, err.Error())
default:
// This still has the kind/reason format but a kind that's returned
// by dnf-json and not explicitly handled here.

2
internal/cloudapi/v2/v2.go
View file

@ -697,7 +697,7 @@ func generateManifest(ctx context.Context, cancel context.CancelFunc, workers *w
}
if jobErr := depsolveResults.JobError; jobErr != nil {
if jobErr.ID == clienterrors.ErrorDNFDepsolveError || jobErr.ID == clienterrors.ErrorDNFMarkingError {
if jobErr.ID == clienterrors.ErrorDNFDepsolveError || jobErr.ID == clienterrors.ErrorDNFMarkingErrors {
jobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDepsolveDependency, "Error in depsolve job dependency input, bad package set requested")
return
}

4
internal/worker/clienterrors/errors.go
View file

@ -21,7 +21,7 @@ const (
ErrorOldResultCompatible ClientErrorCode = 18
ErrorDNFDepsolveError ClientErrorCode = 20
ErrorDNFMarkingError ClientErrorCode = 21
ErrorDNFMarkingErrors ClientErrorCode = 21
ErrorDNFOtherError ClientErrorCode = 22
ErrorRPMMDError ClientErrorCode = 23
)
@ -53,7 +53,7 @@ func GetStatusCode(err *Error) StatusCode {
switch err.ID {
case ErrorDNFDepsolveError:
return JobStatusUserInputError
case ErrorDNFMarkingError:
case ErrorDNFMarkingErrors:
return JobStatusUserInputError
case ErrorNoDynamicArgs:
return JobStatusUserInputError