From 886bd34c55919d7b5542c214ed785da2d92bd70f Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 12 Jul 2019 16:24:58 +0000 Subject: [PATCH] MockModuleBuilder.py: Fix for libmodulemd v2 With v2 of the libmodulemd API, writing a module to a string requires creating a Modulemd.ModuleIndex object. --- module_build_service/builder/MockModuleBuilder.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py index 24cfbf50..153661ec 100644 --- a/module_build_service/builder/MockModuleBuilder.py +++ b/module_build_service/builder/MockModuleBuilder.py @@ -32,7 +32,7 @@ import re import subprocess import threading -from module_build_service import conf, log +from module_build_service import conf, log, Modulemd import module_build_service.scm import module_build_service.utils import module_build_service.scheduler @@ -231,7 +231,10 @@ class MockModuleBuilder(GenericBuilder): # ...and inject modules.yaml there if asked. if include_module_yaml: mmd_path = os.path.join(path, "modules.yaml") - m1_mmd.dump(mmd_path) + mmd_index = Modulemd.ModuleIndex.new() + mmd_index.add_module_stream(m1_mmd) + with open(mmd_path, "w") as f: + f.write(mmd_index.dump_to_string()) execute_cmd(["/usr/bin/modifyrepo_c", "--mdtype=modules", mmd_path, repodata_path]) def _add_repo(self, name, baseurl, extra=""):