PR#856: Add modulemd metadata to resulting repository even if the module has no components. - pungi

pungi

#856 Add modulemd metadata to resulting repository even if the module has no components.

Merged 6 years ago by lsedlar. Opened 6 years ago by jkaluza.

jkaluza/pungi include-modulemd-without-component into master

Add modulemd metadata to resulting repository even if the module has no components.

Jan Kaluza • 6 years ago

21f7937

pungi/phases/gather/sources/source_module.py

file modified

+13 -7

		`@@ -47,6 +47,14 @@`
		`if variant is not None and variant.modules:`
		`variant.arch_mmds.setdefault(arch, {})`

		`+ # Generate architecture specific modulemd metadata, so we can`
		`+ # store per-architecture artifacts there later.`
		`+ for mmd in variant.mmds:`
		`+ mmd_id = "%s-%s" % (mmd.name, mmd.stream)`
		`+ if mmd_id not in variant.arch_mmds[arch]:`
		`+ arch_mmd = yaml.safe_load(mmd.dumps())`
		`+ variant.arch_mmds[arch][mmd_id] = arch_mmd`
		`+`
		`# Contains per-module RPMs added to variant.`
		`added_rpms = {}`

		`@@ -64,13 +72,7 @@`

		`for mmd in variant.mmds:`
		`mmd_id = "%s-%s" % (mmd.name, mmd.stream)`
		`- # Generate architecture specific modulemd metadata`
		`- # with list of artifacts only for this architecture.`
		`- if mmd_id not in variant.arch_mmds[arch]:`
		`- arch_mmd = yaml.safe_load(mmd.dumps())`
		`- variant.arch_mmds[arch][mmd_id] = arch_mmd`
		`- else:`
		`- arch_mmd = variant.arch_mmds[arch][mmd_id]`
		`+ arch_mmd = variant.arch_mmds[arch][mmd_id]`

		`srpm = kobo.rpmlib.parse_nvr(rpm_obj.sourcerpm)["name"]`
		`if (srpm in mmd.components.rpms.keys() and`
		`@@ -92,6 +94,10 @@`
		`# list is later used in createrepo phase to generated modules.yaml.`
		`for mmd_id, rpm_nevras in added_rpms.items():`
		`arch_mmd = variant.arch_mmds[arch][mmd_id]`
		`+ # Modules without artifacts are also valid.`
		`+ if ("artifacts" not in arch_mmd["data"] or`
		`+ "rpms" not in arch_mmd["data"]["artifacts"]):`
		`+ continue`
		`arch_mmd["data"]["artifacts"]["rpms"] = [`
		`rpm_nevra for rpm_nevra in rpm_nevras`
		`if rpm_nevra in arch_mmd["data"]["artifacts"]["rpms"]]`

jkaluza commented 6 years ago

This moves code adding modulemd to variant.arch_mmds outside of for rpm_obj in rpms:, so we have the mmd in variant.arch_mmds even when variant does not contain any RPM.

It also handles the case when module does not contain any artifact when iterating over the list of added RPMs.

jkaluza commented 6 years ago

I've tested this on staging composer with empty testmodule-master build and some older version of testmodule-master with some RPM components and it seems OK.