From 0f6a1987d483cc634baee7f2bd34c531a2131250 Mon Sep 17 00:00:00 2001
From: Kota Kanbe <kotakanbe@gmail.com>
Date: Mon, 6 Apr 2020 19:40:05 +0900
Subject: [PATCH] fix(configtest): yum-utils instead of dnf-utils on RHEL8,
 Cent8 (#948)

---
 scan/centos.go | 14 ++++----------
 scan/rhel.go   |  7 ++-----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/scan/centos.go b/scan/centos.go
index ab18c7d1..7a44725d 100644
--- a/scan/centos.go
+++ b/scan/centos.go
@@ -49,11 +49,8 @@ func (o *centos) depsFast() []string {
 	}
 
 	// repoquery
-	majorVersion, _ := o.Distro.MajorVersion()
-	if majorVersion <= 8 {
-		return []string{"yum-utils"}
-	}
-	return []string{"dnf-utils"}
+	// `rpm -qa` shows dnf-utils as yum-utils on RHEL8, CentOS8
+	return []string{"yum-utils"}
 }
 
 func (o *centos) depsFastRoot() []string {
@@ -62,11 +59,8 @@ func (o *centos) depsFastRoot() []string {
 	}
 
 	// repoquery
-	majorVersion, _ := o.Distro.MajorVersion()
-	if majorVersion <= 8 {
-		return []string{"yum-utils"}
-	}
-	return []string{"dnf-utils"}
+	// `rpm -qa` shows dnf-utils as yum-utils on RHEL8, CentOS8
+	return []string{"yum-utils"}
 }
 
 func (o *centos) depsDeep() []string {
diff --git a/scan/rhel.go b/scan/rhel.go
index bf815a1a..be1894c9 100644
--- a/scan/rhel.go
+++ b/scan/rhel.go
@@ -55,11 +55,8 @@ func (o *rhel) depsFastRoot() []string {
 	}
 
 	// repoquery
-	majorVersion, _ := o.Distro.MajorVersion()
-	if majorVersion < 8 {
-		return []string{"yum-utils"}
-	}
-	return []string{"dnf-utils"}
+	// `rpm -qa` shows dnf-utils as yum-utils on RHEL8, CentOS8
+	return []string{"yum-utils"}
 }
 
 func (o *rhel) depsDeep() []string {