From f8b39cd34efd175fbb59a9c0b08072e4e2a951d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Thu, 23 Feb 2023 10:59:24 +0100 Subject: [PATCH] manifest/os: fix SUPPRESSED_ERROR issue reported by Coverity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following error reported by Coverity: ``` Defect type: SUPPRESSED_ERROR 1. osbuild-composer-75/_build/src/github.com/osbuild/osbuild-composer/internal/manifest/os.go:546: suppressed_error: The error returned by the function "GetVerStrFromPackageSpecList(p.packageSpecs, "dracut-config-rescue")" is not explicitly checked. 2. osbuild-composer-75/_build/src/github.com/osbuild/osbuild-composer/internal/manifest/os.go:546: remediation: Explicitly check the return error. 544| } 545| 546|-> rescueVer, _ := rpmmd.GetVerStrFromPackageSpecList(p.packageSpecs, "dracut-config-rescue") 547| hasRescue := rescueVer != "" 548| bootloader = osbuild.NewGrub2LegacyStage( ``` Change the code to check if the called function returned an error or not. If not error is returned, then the function returns a package version string. Signed-off-by: Tomáš Hozza --- internal/manifest/os.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/manifest/os.go b/internal/manifest/os.go index c73c7071c..7bdc9be77 100644 --- a/internal/manifest/os.go +++ b/internal/manifest/os.go @@ -544,8 +544,8 @@ func (p *OS) serialize() osbuild.Pipeline { Nick: p.OSNick, } - rescueVer, _ := rpmmd.GetVerStrFromPackageSpecList(p.packageSpecs, "dracut-config-rescue") - hasRescue := rescueVer != "" + _, err := rpmmd.GetVerStrFromPackageSpecList(p.packageSpecs, "dracut-config-rescue") + hasRescue := err == nil bootloader = osbuild.NewGrub2LegacyStage( osbuild.NewGrub2LegacyStageOptions( p.Grub2Config,