modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-02 10:20:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the module name validation to validate_mmd

Browse Source
This commit is contained in:
mprahl
2019-04-03 17:38:07 -04:00
parent 1570db8a7e
commit e2b2da7708
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module_build_service/utils/submit.py
View File

@@ -302,6 +302,10 @@ def validate_mmd(mmd):
if 'mbs' in mmd.get_xmd():
raise ValidationError('The "mbs" xmd field is reserved for MBS')
if mmd.get_name() in conf.base_module_names:
raise ValidationError(
'You cannot build a module named "{}" since it is a base module'.format(mmd.get_name()))
def merge_included_mmd(mmd, included_mmd):
"""
@@ -609,11 +613,6 @@ def submit_module_build(username, mmd, params):
log.debug('Submitted %s module build for %s:%s:%s',
("scratch" if params.get('scratch', False) else "normal"),
mmd.get_name(), mmd.get_stream(), mmd.get_version())
if mmd.get_name() in conf.base_module_names:
raise ValidationError(
'You cannot build a module named "{}" since it is a base module'.format(mmd.get_name()))
validate_mmd(mmd)
raise_if_stream_ambigous = False