Skip to content

Commit

Permalink
properly query non-SCL'ed hammer version on EL8
Browse files Browse the repository at this point in the history
Refs: #1206
  • Loading branch information
evgeni authored and ehelms committed Sep 11, 2020
1 parent 8139cc3 commit 082b7e9
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion bats/foreman_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 082b7e9

Please sign in to comment.