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

Support base modules with virtual streams and no stream version

Browse Source
This commit is contained in:
mprahl
2019-07-15 09:19:21 -04:00
parent 1bcb40d4d0
commit 280a25b939
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module_build_service/mmd_resolver.py
View File

@@ -235,12 +235,12 @@ class MMDResolver(object):
# and so on. We therefore need to convert the stream and version of base module to
# integer representation and add "module($name:$stream) = $stream_based_version"
# to Provides.
version = ModuleBuild.get_stream_version(mmd.get_stream_name(), right_pad=False)
if version:
stream_version = ModuleBuild.get_stream_version(mmd.get_stream_name(), right_pad=False)
if stream_version:
dep = self.pool.Dep(
"module(%s:%s)" % (mmd.get_module_name(), mmd.get_stream_name())
).Rel(
solv.REL_EQ, self.pool.Dep(str(version))
solv.REL_EQ, self.pool.Dep(str(stream_version))
)
solvable.add_deparray(solv.SOLVABLE_PROVIDES, dep)
@@ -249,6 +249,7 @@ class MMDResolver(object):
if not xmd.get("mbs", {}).get("virtual_streams"):
return
version = stream_version or mmd.get_version()
# For each virtual stream, add
# "module($name:$stream) = $virtual_stream_based_version" provide.
for stream in xmd["mbs"]["virtual_streams"]: