From fbe362bbd700098f224e034246396eaa22dbf6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= Date: Wed, 9 Nov 2016 07:08:58 +0100 Subject: [PATCH] Fix issue with creating project for group --- module_build_service/builder.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index 41d4cf73..cbd1e1cf 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -824,19 +824,26 @@ class CoprModuleBuilder(GenericBuilder): Koji Example: create tag, targets, set build tag inheritance... """ - self.copr = self._get_copr() + self.copr = self._get_copr_safe() if self.copr and self.copr.projectname and self.copr.username: self.__prep = True log.info("%r buildroot sucessfully connected." % self) - def _get_copr(self): + def _get_copr_safe(self): from copr.exceptions import CoprRequestException # @TODO how the authentication is designed? - username, copr = "@copr", "modules" + kwargs = {"ownername": "@copr", "projectname": self.tag_name} try: - return self.client.get_project_details(copr, username=username).handle + return self._get_copr(**kwargs) except CoprRequestException: - return self.client.create_project(username, copr, ["fedora-24-x86_64"]).handle + self._create_copr(**kwargs) + return self._get_copr(**kwargs) + + def _get_copr(self, ownername, projectname): + return self.client.get_project_details(projectname, username=ownername).handle + + def _create_copr(self, ownername, projectname): + return self.client.create_project(ownername, projectname, ["fedora-24-x86_64"]) def buildroot_ready(self, artifacts=None): """