From 6ca12a493d125e1c2f6111b18e1ce8c810690f11 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Wed, 7 Dec 2022 15:45:36 +0100 Subject: [PATCH] osbuild-worker: add dnf-json error reason to depsolve job error --- cmd/osbuild-worker/jobimpl-depsolve.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/osbuild-worker/jobimpl-depsolve.go b/cmd/osbuild-worker/jobimpl-depsolve.go index 8ec1ba6aa..171deb88f 100644 --- a/cmd/osbuild-worker/jobimpl-depsolve.go +++ b/cmd/osbuild-worker/jobimpl-depsolve.go @@ -50,15 +50,15 @@ func (impl *DepsolveJobImpl) Run(job worker.Job) error { // Error originates from dnf-json switch e.Kind { case "DepsolveError": - result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFDepsolveError, err.Error(), nil) + result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFDepsolveError, err.Error(), e.Reason) case "MarkingErrors": - result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFMarkingErrors, err.Error(), nil) + result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFMarkingErrors, err.Error(), e.Reason) case "RepoError": - result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFRepoError, err.Error(), nil) + result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFRepoError, err.Error(), e.Reason) default: // This still has the kind/reason format but a kind that's returned // by dnf-json and not explicitly handled here. - result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFOtherError, err.Error(), nil) + result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFOtherError, err.Error(), e.Reason) logWithId.Errorf("Unhandled dnf-json error in depsolve job: %v", err) } case error: