From 3f815a82978cfa6be6db4d4df4e8beb7e89929e5 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Fri, 11 Sep 2020 11:23:52 +0200
Subject: [PATCH] properly query non-SCL'ed hammer version on EL8

Refs: #1206
---
 bats/foreman_helper.bash | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bats/foreman_helper.bash b/bats/foreman_helper.bash
index e804c3bf0..0d762d75f 100644
--- a/bats/foreman_helper.bash
+++ b/bats/foreman_helper.bash
@@ -29,7 +29,12 @@ tSkipIfNoPulp2() {
 }
 
 tSkipIfHammerBelow018() {
-  RPM_VERSION=$(rpm -q --queryformat '%{VERSION}' tfm-rubygem-hammer_cli)
+  if tPackageExists tfm-rubygem-hammer_cli; then
+    RPM_PACKAGE=tfm-rubygem-hammer_cli
+  else
+    RPM_PACKAGE=rubygem-hammer_cli
+  fi
+  RPM_VERSION=$(rpm -q --queryformat '%{VERSION}' ${RPM_PACKAGE})
 
   run rpmdev-vercmp $RPM_VERSION 0.18 > /dev/null
   if [[ $status == 12 ]]; then