properly query non-SCL'ed hammer version on EL8

Refs: theforeman#1206
evgeni · Sep 11, 2020 · 3f815a8 · 3f815a8
1 parent 8139cc3
commit 3f815a8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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