Merge branch 'master' of ssh://pagure.io/fm-orchestrator

This commit is contained in:
Jan Kaluza
2017-04-07 07:21:31 +02:00

View File

@@ -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
@@ -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)