modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-11 18:37:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check dnf version before skipping base module conflicts

Browse Source 
The base module conflict generation was skipped for local builds
in 6b2e5be93a because libdnf wasn't ported to libmodulemd yet -
that was done in libdnf-0.45, so only warn and skip for versions of
dnf too old to require libdnf-0.45.

(Don't just unconditionally skip check/warning in case someone is
doing local module builds on RHEL 8.)
This commit is contained in:
Owen W. Taylor
2020-10-29 11:23:06 -04:00
parent c66eca6044
commit 1f2fbca7d4
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_scheduler/test_default_modules.py
View File

@@ -291,7 +291,8 @@ def test_handle_collisions_with_base_module_rpms(mock_grft, mock_get_session):
}
mock_grft.side_effect = [bm_rpms, non_bm_rpms]
default_modules.handle_collisions_with_base_module_rpms(mmd, ["aarch64", "x86_64"])
default_modules.handle_collisions_with_base_module_rpms(mmd, ["aarch64", "x86_64"],
force_for_old_dnf=True)
mock_get_session.assert_called_once()
xmd_mbs = mmd.get_xmd()["mbs"]