Skip to content

check_os_dependency: Handle the fact that get_os_name can produce RHEL and SL* #3072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

check_os_dependency: Handle the fact that get_os_name can produce RHEL and SL* #3072

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92170ab
check_os_dependency: Handle the fact that get_os_name can produce RHE…
akesandgren Nov 6, 2019
4733363
check_os_dependency: Also handle fedora
akesandgren Nov 6, 2019
98736c5
Merge branch 'develop' into make_check_os_dependency_better
akesandgren Mar 30, 2020
76c8f8e
Avoid startswith for rh_based check.
akesandgren Mar 30, 2020
fabc16d
Merge branch 'develop' of https://github.com/easybuilders/easybuild-f…
akesandgren Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion easybuild/tools/systemtools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ def check_os_dependency(dep):
found = False
cmd = None
os_to_pkg_cmd_map = {
'centos': RPM,
'debian': DPKG,
'redhat': RPM,
'ubuntu': DPKG,
Expand All @@ -670,6 +669,11 @@ def check_os_dependency(dep):
RPM: '-q',
}
os_name = get_os_name()

rh_based_os = os_name in ['centos', 'fedora', 'redhat', 'RHEL', 'SL']
if rh_based_os:
os_name = 'redhat'

if os_name in os_to_pkg_cmd_map:
pkg_cmds = [os_to_pkg_cmd_map[os_name]]
else:
Expand Down