| |
@@ -276,7 +276,7 @@
|
| |
u"module": {
|
| |
u"module_build_service_id": self.module.id,
|
| |
u"content_koji_tag": self.module.koji_tag,
|
| |
- u"modulemd_str": self.module.modulemd,
|
| |
+ u"modulemd_str": self._get_fixed_mmd(),
|
| |
u"name": ret["name"],
|
| |
u"stream": self.module.stream,
|
| |
u"version": self.module.version,
|
| |
@@ -327,6 +327,16 @@
|
| |
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.
|
| |
@@ -753,7 +763,7 @@
|
| |
mmd_path = os.path.join(prepdir, "modulemd.txt")
|
| |
log.info("Writing generic modulemd.yaml to %r" % mmd_path)
|
| |
with open(mmd_path, "w", encoding="utf-8") as mmd_f:
|
| |
- mmd_f.write(self.mmd)
|
| |
+ 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)
|
| |
Method _finalize_mmd does same logic at line:
It would be good to make this method accept argument
mmd
in order to be reused at these two places.