From ff758a48f16ac4ef33b7c7ed525d2ee25bb2a972 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Oct 25 2018 07:08:52 +0000 Subject: Include also 'src' RPMs in the final RPMs list. This fixes regression introduced in previous bcb104a16 commit. --- diff --git a/module_build_service/builder/KojiContentGenerator.py b/module_build_service/builder/KojiContentGenerator.py index 5da0003..5026024 100644 --- a/module_build_service/builder/KojiContentGenerator.py +++ b/module_build_service/builder/KojiContentGenerator.py @@ -468,8 +468,9 @@ class KojiContentGenerator(object): # Filter out RPMs which will never end up in final modulemd: # - the architecture of an RPM is not multilib architecture for `arch`. # - the architecture of an RPM is not the final mmd architecture. - # - the architecture of an RPM is not "noarch". - if rpm["arch"] not in multilib_arches and rpm["arch"] not in [arch, "noarch"]: + # - the architecture of an RPM is not "noarch" or "src". + if (rpm["arch"] not in multilib_arches and + rpm["arch"] not in [arch, "noarch", "src"]): continue srpm = rpm["srpm_name"] diff --git a/tests/test_content_generator.py b/tests/test_content_generator.py index 1595eb0..24d8aad 100644 --- a/tests/test_content_generator.py +++ b/tests/test_content_generator.py @@ -433,9 +433,11 @@ class TestBuild: self._add_test_rpm("dhcp-libs-12:4.3.5-5.module_2118aef6.x86_64", "dhcp") self._add_test_rpm("dhcp-libs-12:4.3.5-5.module_2118aef6.i686", "dhcp") self._add_test_rpm("dhcp-libs-12:4.3.5-5.module_2118aef6.s390x", "dhcp") + self._add_test_rpm("dhcp-libs-12:4.3.5-5.module_2118aef6.src", "dhcp") self._add_test_rpm("perl-Tangerine-12:4.3.5-5.module_2118aef6.x86_64", "perl-Tangerine") self._add_test_rpm("perl-Tangerine-12:4.3.5-5.module_2118aef6.i686", "perl-Tangerine") self._add_test_rpm("perl-Tangerine-12:4.3.5-5.module_2118aef6.s390x", "perl-Tangerine") + self._add_test_rpm("perl-Tangerine-12:4.3.5-5.module_2118aef6.src", "perl-Tangerine") mmd = self.cg.module.mmd() mmd = self.cg._fill_in_rpms_list(mmd, "x86_64") @@ -443,7 +445,9 @@ class TestBuild: # Only x86_64 packages should be filled in, because we requested x86_64 arch. assert set(mmd.get_rpm_artifacts().get()) == set([ "dhcp-libs-12:4.3.5-5.module_2118aef6.x86_64", - "perl-Tangerine-12:4.3.5-5.module_2118aef6.x86_64"]) + "dhcp-libs-12:4.3.5-5.module_2118aef6.src", + "perl-Tangerine-12:4.3.5-5.module_2118aef6.x86_64", + "perl-Tangerine-12:4.3.5-5.module_2118aef6.src"]) def test_fill_in_rpms_exclusivearch(self): self._add_test_rpm("dhcp-libs-12:4.3.5-5.module_2118aef6.noarch", "dhcp",