From 1ec28cd67029d2dc1867f07f3d502a5cd55a3ed5 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 6 Apr 2017 15:45:05 -0400 Subject: [PATCH 1/2] Typo in the argument name here. --- module_build_service/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index 705c6cf9..3c1cbfd5 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -402,7 +402,7 @@ class KojiModuleBuilder(GenericBuilder): @staticmethod - def get_disttag_srpm(disttag, build): + def get_disttag_srpm(disttag, module_build): #Taken from Karsten's create-distmacro-pkg.sh # - however removed any provides to system-release/redhat-release From 9f017c7b71b8c4ea394874ef5842aa23438270b4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 6 Apr 2017 15:47:16 -0400 Subject: [PATCH 2/2] Further typofix. --- module_build_service/builder.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index 3c1cbfd5..d81dabb9 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -457,8 +457,10 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules * {today} Fedora-Modularity - {version}-{release}{disttag} - autogenerated macro by Module Build Service (MBS) """.format(disttag=disttag, today=today, name=name, version=version, - release=release, module_name=build.name, module_stream=build.stream, - module_version=build.version) + release=release, + module_name=module_build.name, + module_stream=module_build.stream, + module_version=module_build.version) td = tempfile.mkdtemp(prefix="module_build_service-build-macros") fd = open(os.path.join(td, "%s.spec" % name), "w") fd.write(spec_content)