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

Fix format_mmd function for empty scmurl

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-02-27 21:03:20 +01:00
parent c8e2e06e57
commit 9b02605370
2 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
module_build_service/utils.py
View File

@@ -444,23 +444,23 @@ def format_mmd(mmd, scmurl):
# them because of dep-chain.
from module_build_service.scm import SCM
mmd.xmd['mbs'] = {'scmurl': scmurl}
mmd.xmd['mbs'] = {'scmurl': scmurl, 'commit': None}
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()
mmd.xmd['mbs']['commit'] = full_scm_hash
# If a commit hash wasn't provided then just get the latest from master
else:
# If module build was submitted via yaml file, there is no scmurl
if scmurl:
scm = SCM(scmurl)
mmd.xmd['mbs']['commit'] = scm.get_latest()
# 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()
mmd.xmd['mbs']['commit'] = full_scm_hash
# If a commit hash wasn't provided then just get the latest from master
else:
mmd.xmd['mbs']['commit'] = scm.get_latest()
# If the modulemd yaml specifies module buildrequires, replace the streams
# with commit hashes