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

Merge #766 Some more useful error messages.

Browse Source
This commit is contained in:
Matt Prahl
2017-11-03 20:24:28 +00:00
parent e91f4fdea6 5e420a61ee
commit 43b0367c40
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module_build_service/utils.py
View File

@@ -773,9 +773,12 @@ def format_mmd(mmd, scmurl, session=None):
for pkgname, pkg in mmd.components.rpms.items():
if pkg.repository and not conf.rpms_allow_repository:
raise Forbidden(
"Custom component repositories aren't allowed")
"Custom component repositories aren't allowed. "
"%r bears repository %r" % (pkgname, pkg.repository))
if pkg.cache and not conf.rpms_allow_cache:
raise Forbidden("Custom component caches aren't allowed")
raise Forbidden(
"Custom component caches aren't allowed. "
"%r bears cache %r" % (pkgname, pkg.cache))
if not pkg.repository:
pkg.repository = conf.rpms_default_repository + pkgname
if not pkg.cache:
@@ -787,7 +790,8 @@ def format_mmd(mmd, scmurl, session=None):
for modname, mod in mmd.components.modules.items():
if mod.repository and not conf.modules_allow_repository:
raise Forbidden(
"Custom component repositories aren't allowed")
"Custom module repositories aren't allowed. "
"%r bears repository %r" % (modname, mod.repository))
if not mod.repository:
mod.repository = conf.modules_default_repository + modname
if not mod.ref:
@@ -814,7 +818,8 @@ def validate_mmd(mmd):
for modname, mod in mmd.components.modules.items():
if mod.repository and not conf.modules_allow_repository:
raise Forbidden(
"Custom component repositories aren't allowed")
"Custom module repositories aren't allowed. "
"%r bears repository %r" % (modname, mod.repository))
def merge_included_mmd(mmd, included_mmd):