From b2c91175b3256a78c7f9306c1e50ca7b52c408cf Mon Sep 17 00:00:00 2001 From: hiroka-wada <47963288+wadda0714@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:16:13 +0900 Subject: [PATCH] fix(scanner/redhat): make cache before detect dnf modules (#1812) Co-authored-by: wadahiroka --- scanner/redhatbase.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scanner/redhatbase.go b/scanner/redhatbase.go index 47afa676..22d55c31 100644 --- a/scanner/redhatbase.go +++ b/scanner/redhatbase.go @@ -420,6 +420,10 @@ func (o *redhatBase) scanPackages() (err error) { return xerrors.Errorf("Failed to scan installed packages: %w", err) } + if err := o.yumMakeCache(); err != nil { + return xerrors.Errorf("Failed to execute `yum makecache`: %w", err) + } + if o.EnabledDnfModules, err = o.detectEnabledDnfModules(); err != nil { return xerrors.Errorf("Failed to detect installed dnf modules: %w", err) } @@ -645,10 +649,6 @@ func (o *redhatBase) yumMakeCache() error { } func (o *redhatBase) scanUpdatablePackages() (models.Packages, error) { - if err := o.yumMakeCache(); err != nil { - return nil, xerrors.Errorf("Failed to `yum makecache`: %w", err) - } - isDnf := o.exec(util.PrependProxyEnv(`repoquery --version | grep dnf`), o.sudo.repoquery()).isSuccess() cmd := `repoquery --all --pkgnarrow=updates --qf='%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{REPO}'` if isDnf {