PR#76: Few fixes for generating modulemd from web UI - copr/copr

Jakub Kadlčík • 6 years ago

9739c67

Jakub Kadlčík • 6 years ago

e42a907

file modified

+13 -1

		`@@ -115,11 +115,23 @@`

		`def add_component(self, package_name, build, chroot, rationale, buildorder=1):`
		`ref = str(chroot.git_hash) if chroot else ""`
		`- url = os.path.join(self.config["DIST_GIT_URL"], build.copr.full_name, "{}.git".format(build.package.name))`
		`+ distgit_url = self.config["DIST_GIT_URL"].replace("/cgit", "/git")`
		`+ url = os.path.join(distgit_url, build.copr.full_name, "{}.git".format(build.package.name))`
		`self.mmd.components.add_rpm(str(package_name), rationale,`
		`repository=url, ref=ref,`
		`buildorder=buildorder)`

		`+ def add_requires(self, module, stream):`
		`+ self.mmd.add_requires(module, stream)`
		`+`
		`+ def add_buildrequires(self, module, stream):`
		`+ self.mmd.add_buildrequires(module, stream)`
		`+`
		`+ def add_base_runtime(self):`
		`+ name, stream = "base-runtime", "master"`
		`+ self.add_requires(name, stream)`
		`+ self.add_buildrequires(name, stream)`
		`+`
		`def generate(self):`
		`return self.mmd.dumps()`

file modified

		`@@ -983,6 +983,7 @@`
		`generator.add_api(form.api.data)`
		`generator.add_profiles(enumerate(zip(form.profile_names.data, form.profile_pkgs.data)))`
		`generator.add_components(form.packages.data, form.filter.data, form.builds.data)`
		`+ generator.add_base_runtime()`
		`tmp = tempfile.mktemp()`
		`generator.dump(tmp)`

I made two little changes for generating modulemd yaml from web UI

Replace /cgit to /git for package repositories in rpms section. For some packages there was an issue with cloning from the original URL.
Make all generated modules dependent on base-runtime. I mean, sure, base-runtime is not required for every module, I might want to build my own alternative for base-runtime. However this is power-user use case and I would say that they will use copr-cli anyway.