From 502edb2712acacb02b854098ea73b7f76df73676 Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Jun 13 2017 14:06:42 +0000 Subject: Set higher buildorder of api components --- diff --git a/modularity/module_generator.py b/modularity/module_generator.py index 788cbda..d23fdf4 100644 --- a/modularity/module_generator.py +++ b/modularity/module_generator.py @@ -54,13 +54,13 @@ class ModuleGenerator(object): self.mmd.filter.add_rpm(pkg) for pkg in self.build_deps.intersection(self.run_deps): - self.mmd.components.add_rpm(pkg, "Build and runtime dependency.") + self.mmd.components.add_rpm(pkg, "Build and runtime dependency.", buildorder=self._get_build_order(pkg)) for pkg in (self.build_deps - self.run_deps): - self.mmd.components.add_rpm(pkg, "Build dependency.") + self.mmd.components.add_rpm(pkg, "Build dependency.", buildorder=self._get_build_order(pkg)) for pkg in (self.run_deps - self.build_deps): - self.mmd.components.add_rpm(pkg, "Runtime dependency.") + self.mmd.components.add_rpm(pkg, "Runtime dependency.", buildorder=self._get_build_order(pkg)) for mod, caps in self.differ.build_caps_classified.items(): if mod == 'result': @@ -77,6 +77,12 @@ class ModuleGenerator(object): name, stream = self.differ.get_module_name(mod).split(':') self.mmd.add_requires(name, stream) + def _get_build_order(self, pkg): + if pkg in self.mmd.api.rpms: + return 10 + else: + return 0 + def _get_pkg_info(self): """ Function loads package from dnf