From 476a26f84fd1e1e9201e546eb3be8e6add05f043 Mon Sep 17 00:00:00 2001 From: Owen W. Taylor Date: Jan 22 2019 13:42:39 +0000 Subject: Fix buildorder for generated flatpak modulemd When include_api_section was false, then looking at the mmd object to figure out whether a component was an "api srpm" didn't work. --- diff --git a/_fedmod/module_generator.py b/_fedmod/module_generator.py index e5d1884..09e2062 100644 --- a/_fedmod/module_generator.py +++ b/_fedmod/module_generator.py @@ -124,7 +124,7 @@ class ModuleGenerator(object): # rather than relying solely on the warnings emitted on stderr def _get_build_order(self, pkg): - if self.mmd.peek_rpm_api().contains(pkg): + if pkg in self.api_srpms: return 10 else: return 0 diff --git a/tests/test_flatpak_generator.py b/tests/test_flatpak_generator.py index be3e5fc..f1c0080 100644 --- a/tests/test_flatpak_generator.py +++ b/tests/test_flatpak_generator.py @@ -159,7 +159,9 @@ class TestFlatpak(object): ]) assert modmd.props.components_rpm['eog'].props.rationale == "Application package" + assert modmd.props.components_rpm['eog'].props.buildorder == 10 assert modmd.props.components_rpm['exempi'].props.rationale == "Runtime dependency" + assert modmd.props.components_rpm['exempi'].props.buildorder == 0 # Expected module dependencies for eog dependencies = modmd.props.dependencies diff --git a/tests/test_module_generator.py b/tests/test_module_generator.py index cbca320..7a0c788 100644 --- a/tests/test_module_generator.py +++ b/tests/test_module_generator.py @@ -79,6 +79,7 @@ class TestMultiplePackageInput(object): assert set(modmd.props.components_rpm) == expected_components assert modmd.props.components_rpm['grep'].props.rationale == "Package in api" + assert modmd.props.components_rpm['grep'].props.buildorder == 10 # Expected module dependencies for grep dependencies = modmd.props.dependencies