Skip to content

Commit b2c9117

Browse files
wadda0714wadahiroka
and
wadahiroka
authored
fix(scanner/redhat): make cache before detect dnf modules (#1812)
Co-authored-by: wadahiroka <[email protected]>
1 parent d122499 commit b2c9117

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scanner/redhatbase.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,10 @@ func (o *redhatBase) scanPackages() (err error) {
420420
return xerrors.Errorf("Failed to scan installed packages: %w", err)
421421
}
422422

423+
if err := o.yumMakeCache(); err != nil {
424+
return xerrors.Errorf("Failed to execute `yum makecache`: %w", err)
425+
}
426+
423427
if o.EnabledDnfModules, err = o.detectEnabledDnfModules(); err != nil {
424428
return xerrors.Errorf("Failed to detect installed dnf modules: %w", err)
425429
}
@@ -645,10 +649,6 @@ func (o *redhatBase) yumMakeCache() error {
645649
}
646650

647651
func (o *redhatBase) scanUpdatablePackages() (models.Packages, error) {
648-
if err := o.yumMakeCache(); err != nil {
649-
return nil, xerrors.Errorf("Failed to `yum makecache`: %w", err)
650-
}
651-
652652
isDnf := o.exec(util.PrependProxyEnv(`repoquery --version | grep dnf`), o.sudo.repoquery()).isSuccess()
653653
cmd := `repoquery --all --pkgnarrow=updates --qf='%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{REPO}'`
654654
if isDnf {

0 commit comments

Comments
 (0)