modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-06-14 22:17:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify format_mmd since scm.commit is always set or returns an exception

Browse Source
This commit is contained in:
mprahl
2019-04-30 09:49:02 -04:00
parent f4dd91e9ec
commit 37e4c718d9
4 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module_build_service/utils/submit.py
View File

@@ -145,18 +145,13 @@ def format_mmd(mmd, scmurl, module=None, session=None):
# If module build was submitted via yaml file, there is no scmurl
if scmurl:
scm = SCM(scmurl)
# If a commit hash is provided, add that information to the modulemd
if scm.commit:
# We want to make sure we have the full commit hash for consistency
if SCM.is_full_commit_hash(scm.scheme, scm.commit):
full_scm_hash = scm.commit
else:
full_scm_hash = scm.get_full_commit_hash()
xmd["mbs"]["commit"] = full_scm_hash
# If a commit hash wasn't provided then just get the latest from master
# We want to make sure we have the full commit hash for consistency
if SCM.is_full_commit_hash(scm.scheme, scm.commit):
full_scm_hash = scm.commit
else:
xmd["mbs"]["commit"] = scm.get_latest()
full_scm_hash = scm.get_full_commit_hash()
xmd["mbs"]["commit"] = full_scm_hash
if mmd.get_rpm_components() or mmd.get_module_components():
if "rpms" not in xmd["mbs"]: