From 44a418071dee513a946dd4a541bfc08c66525b9a Mon Sep 17 00:00:00 2001 From: Owen W. Taylor Date: Aug 09 2018 11:11:20 +0000 Subject: Fix libmodulemd usage for changes in libmodulemd-1.5 From libmodulemd 1.4 to 1.5, many mmd.props.X were changed to copy X rather than returning a pointer to X - this means that something like mmd.props.rpm_api.add(pkg) no longer works as expected. Change these usages to mmd.props.peek_rpm_api().add(pkg). --- diff --git a/src/_fedmod/flatpak_generator.py b/src/_fedmod/flatpak_generator.py index 521be44..1bebfcd 100644 --- a/src/_fedmod/flatpak_generator.py +++ b/src/_fedmod/flatpak_generator.py @@ -27,7 +27,7 @@ def _get_runtime_packages(): mmd_str = build['extra']['typeinfo']['module']['modulemd_str'] mmd = Modulemd.Module.new_from_string(mmd_str) - return set(mmd.props.profiles['runtime'].props.rpms.get()) + return set(mmd.peek_profiles()['runtime'].peek_rpms().get()) class FlatpakGenerator(ModuleGenerator): diff --git a/src/_fedmod/module_generator.py b/src/_fedmod/module_generator.py index cf7aa54..857fe19 100644 --- a/src/_fedmod/module_generator.py +++ b/src/_fedmod/module_generator.py @@ -66,7 +66,7 @@ class ModuleGenerator(object): are information taken from SPEC file. :return: """ - self.mmd.props.module_licenses.add("MIT") + self.mmd.peek_module_licenses().add("MIT") # FIXME: This and: # https://fedoraproject.org/wiki/Module:Guidelines?rd=Fedora_Packaging_Guidelines_for_Modules @@ -87,7 +87,7 @@ class ModuleGenerator(object): # Declare the public API for pkg in self.api_srpms: - self.mmd.props.rpm_api.add(pkg) + self.mmd.peek_rpm_api().add(pkg) component = Modulemd.ComponentRpm(name=pkg, rationale="Package in api", @@ -114,7 +114,7 @@ class ModuleGenerator(object): def _get_build_order(self, pkg): - if self.mmd.props.rpm_api.contains(pkg): + if self.mmd.peek_rpm_api().contains(pkg): return 10 else: return 0