modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-16 13:56:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #1069 Remove unused variable local_modules from format_mmd

Browse Source
This commit is contained in:
Matt Prahl
2018-11-06 14:03:47 +00:00
parent fb95b6b6cd 254195a4d0
commit 8356848bec
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_build_service/utils/submit.py
View File

@@ -112,7 +112,7 @@ def _scm_get_latest(pkg):
} }
def format_mmd(mmd, scmurl, session=None): def format_mmd(mmd, scmurl):
""" """
Prepares the modulemd for the MBS. This does things such as replacing the Prepares the modulemd for the MBS. This does things such as replacing the
branches of components with commit hashes and adding metadata in the xmd branches of components with commit hashes and adding metadata in the xmd
@@ -124,9 +124,6 @@ def format_mmd(mmd, scmurl, session=None):
# them because of dep-chain. # them because of dep-chain.
from module_build_service.scm import SCM from module_build_service.scm import SCM
if not session:
session = db.session
xmd = glib.from_variant_dict(mmd.get_xmd()) xmd = glib.from_variant_dict(mmd.get_xmd())
if 'mbs' not in xmd: if 'mbs' not in xmd:
xmd['mbs'] = {} xmd['mbs'] = {}
@@ -135,9 +132,6 @@ def format_mmd(mmd, scmurl, session=None):
if 'commit' not in xmd['mbs']: if 'commit' not in xmd['mbs']:
xmd['mbs']['commit'] = '' xmd['mbs']['commit'] = ''
local_modules = models.ModuleBuild.local_modules(session)
local_modules = {m.name + "-" + m.stream: m for m in local_modules}
# If module build was submitted via yaml file, there is no scmurl # If module build was submitted via yaml file, there is no scmurl
if scmurl: if scmurl:
scm = SCM(scmurl) scm = SCM(scmurl)
@@ -300,7 +294,7 @@ def record_component_builds(mmd, module, initial_batch=1,
# Format the modulemd by putting in defaults and replacing streams that # Format the modulemd by putting in defaults and replacing streams that
# are branches with commit hashes # are branches with commit hashes
format_mmd(mmd, module.scmurl, session=session) format_mmd(mmd, module.scmurl)
# When main_mmd is set, merge the metadata from this mmd to main_mmd, # When main_mmd is set, merge the metadata from this mmd to main_mmd,
# otherwise our current mmd is main_mmd. # otherwise our current mmd is main_mmd.