#98 Fix buildorder for generated flatpak modulemd
Merged 5 months ago by nphilipp. Opened 6 months ago by otaylor.
modularity/ otaylor/fedmod flatpak-buildorder  into  master

file modified
+1 -1

@@ -124,7 +124,7 @@ 

          #       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

@@ -159,7 +159,9 @@ 

          ])

  

          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

@@ -79,6 +79,7 @@ 

          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

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.

(Regression from PR#97)

Metadata Update from @nphilipp:
- Request assigned

5 months ago

Sorry, missed this one. Looks good.

Pull-Request has been merged by nphilipp

5 months ago