From db7696eafcb8fb14593b0df4587603fd7f8758d6 Mon Sep 17 00:00:00 2001 From: Matt Prahl Date: Sep 30 2019 14:58:40 +0000 Subject: Merge #1439 `Disable handling collisions on local builds due to RHBZ#1693683` --- diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index bed4c79..b42e478 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -190,7 +190,15 @@ def init(config, db_session, msg): # 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 # 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) build.modulemd = mmd_to_str(mmd)