From 433ddce11c917ddc9ddcde518ef3c0fba90bcb1e Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Mon, 16 Nov 2020 11:38:50 -0500 Subject: [PATCH] MockModuleBuild: Avoid accumulating blank lines around yum.conf Every time we read-and-rewrote mock.cfg, we'd add another set of blank lines around the yum configuration. --- module_build_service/builder/MockModuleBuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py index f3a48ae3..c4804b7c 100644 --- a/module_build_service/builder/MockModuleBuilder.py +++ b/module_build_service/builder/MockModuleBuilder.py @@ -479,7 +479,7 @@ class MockModuleBuilder(GenericBuilder): "$root", "%s-%s" % (self.tag_name, str(threading.current_thread().name))) config = config.replace("$arch", self.arch) config = config.replace("$group", " ".join(self.groups)) - config = config.replace("$yum_conf", self.yum_conf) + config = config.replace("$yum_conf", self.yum_conf.strip()) config = config.replace("$enabled_modules", str(self.enabled_modules)) config = config.replace("$releasever", str(self.releasever))