modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-09 07:04:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable handling collisions on local builds due to RHBZ#1693683

Browse Source
This commit is contained in:
mprahl
2019-09-26 11:42:22 -04:00
parent 453d871e03
commit 6b2e5be93a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_build_service/scheduler/handlers/modules.py
View File

@@ -190,7 +190,15 @@ def init(config, db_session, msg):
# Sets xmd["mbs"]["ursine_rpms"] with RPMs from the buildrequired base modules which # Sets xmd["mbs"]["ursine_rpms"] with RPMs from the buildrequired base modules which
# conflict with the RPMs from other buildrequired modules. This is done to prefer modular # conflict with the RPMs from other buildrequired modules. This is done to prefer modular
# RPMs over base module RPMs even if their NVR is lower. # RPMs over base module RPMs even if their NVR is lower.
handle_collisions_with_base_module_rpms(mmd, arches) if conf.system in ("koji", "test"):
handle_collisions_with_base_module_rpms(mmd, arches)
else:
log.warning(
"The necessary conflicts could not be generated due to RHBZ#1693683. "
"Some RPMs from the base modules (%s) may end up being used over modular RPMs. "
"This may result in different behavior than a production build.",
", ".join(conf.base_module_names)
)
mmd = record_filtered_rpms(db_session, mmd) mmd = record_filtered_rpms(db_session, mmd)
build.modulemd = mmd_to_str(mmd) build.modulemd = mmd_to_str(mmd)