modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-13 19:49:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

combine common code

Browse Source
This commit is contained in:
Mike McLean
2019-10-14 19:03:44 -04:00
parent ad6afecc69
commit 620263c34b
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
module_build_service/builder/KojiContentGenerator.py
View File

@@ -268,11 +268,6 @@ class KojiContentGenerator(object):
ret = self.module.nvr
if self.devel:
ret["name"] += "-devel"
mmd = self.module.mmd()
mmd = mmd.copy(mmd.get_module_name() + "-devel")
modulemd_str = mmd_to_str(mmd)
else:
modulemd_str = self.module.modulemd
ret[u"source"] = self.module.scmurl
ret[u"start_time"] = calendar.timegm(self.module.time_submitted.utctimetuple())
ret[u"end_time"] = calendar.timegm(self.module.time_completed.utctimetuple())
@@ -281,7 +276,7 @@ class KojiContentGenerator(object):
u"module": {
u"module_build_service_id": self.module.id,
u"content_koji_tag": self.module.koji_tag,
u"modulemd_str": modulemd_str,
u"modulemd_str": self._get_fixed_mmd(),
u"name": ret["name"],
u"stream": self.module.stream,
u"version": self.module.version,
@@ -332,6 +327,16 @@ class KojiContentGenerator(object):
u"type": u"rpm",
}
def _get_fixed_mmd(self):
if self.devel:
mmd = self.module.mmd()
mmd = mmd.copy(mmd.get_module_name() + "-devel")
ret = mmd_to_str(mmd)
else:
ret = self.mmd
return ret
def _get_arch_mmd_output(self, output_path, arch):
"""
Returns the CG "output" dict for architecture specific modulemd file.
@@ -757,14 +762,8 @@ class KojiContentGenerator(object):
prepdir = tempfile.mkdtemp(prefix="koji-cg-import")
mmd_path = os.path.join(prepdir, "modulemd.txt")
log.info("Writing generic modulemd.yaml to %r" % mmd_path)
if self.devel:
mmd = self.module.mmd()
mmd = mmd.copy(mmd.get_module_name() + "-devel")
contents = mmd_to_str(mmd)
else:
contents = self.mmd
with open(mmd_path, "w", encoding="utf-8") as mmd_f:
mmd_f.write(contents)
mmd_f.write(self._get_fixed_mmd())
mmd_path = os.path.join(prepdir, "modulemd.src.txt")
self._download_source_modulemd(self.module.mmd(), mmd_path)