From e03272e96670d4e9e90be14165b978ad09851c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= Date: Fri, 18 Nov 2016 02:04:13 +0100 Subject: [PATCH] Convert characters not supported in copr project names --- module_build_service/builder.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index 73c4b966..6783f25d 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -801,7 +801,7 @@ class CoprModuleBuilder(GenericBuilder): def _get_copr_safe(self): from copr.exceptions import CoprRequestException # @TODO how the authentication is designed? - kwargs = {"ownername": "@copr", "projectname": self.tag_name} + kwargs = {"ownername": "@copr", "projectname": CoprModuleBuilder._tag_to_copr_name(self.tag_name)} try: return self._get_copr(**kwargs) except CoprRequestException: @@ -913,6 +913,9 @@ class CoprModuleBuilder(GenericBuilder): the tag with particular name and architecture. """ # @TODO get the correct user + # @TODO get the correct project + owner, project = "@copr", cls._tag_to_copr_name(tag_name) + # Premise is that tag_name is in name-version-release format owner, nvr = "@copr", tag_name client = cls._get_client(config) @@ -925,6 +928,11 @@ class CoprModuleBuilder(GenericBuilder): def cancel_build(self, task_id): pass + @classmethod + def _tag_to_copr_name(cls, koji_tag): + return koji_tag.replace("+", "-") + + class MockModuleBuilder(GenericBuilder): """ See http://blog.samalik.com/copr-in-the-modularity-world/