From 7788c4f3f7454e7f0c3f804934decdd5e6624e8c Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Dec 2020 11:46:05 -0500 Subject: [PATCH] local builds: provide a useful error message for a non-xyz base module If allow_only_compatible_base_modules=True, then it's an error if the module buildrequires a non-xyz base module stream. Give an error message that says how to override the base module in the modulemd file. --- module_build_service/manage.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/module_build_service/manage.py b/module_build_service/manage.py index 1ea718b3..07a76ee7 100755 --- a/module_build_service/manage.py +++ b/module_build_service/manage.py @@ -17,7 +17,7 @@ from module_build_service.builder.MockModuleBuilder import ( import_builds_from_local_dnf_repos, load_local_builds ) from module_build_service.common import conf, models -from module_build_service.common.errors import StreamAmbigous +from module_build_service.common.errors import StreamAmbigous, StreamNotXyz from module_build_service.common.logger import level_flags from module_build_service.common.utils import load_mmd_file, import_mmd import module_build_service.scheduler.consumer @@ -217,7 +217,11 @@ def build_module_locally( except StreamAmbigous as e: logging.error(str(e)) logging.error("Use '-s module_name:module_stream' to choose the stream") - return + return 1 + except StreamNotXyz as e: + logging.error(str(e)) + logging.error("Use '--buildrequires name:stream' to override the base module stream") + return 1 module_build_ids = [build.id for build in module_builds]