From 70185edad4aaeca6b3abe99de4b84338841d306c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= Date: Thu, 6 Apr 2017 18:02:11 +0200 Subject: [PATCH] Move chroot-updating logic to separate function --- module_build_service/builder/CoprModuleBuilder.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/module_build_service/builder/CoprModuleBuilder.py b/module_build_service/builder/CoprModuleBuilder.py index 8e2ecaa0..21dc922c 100644 --- a/module_build_service/builder/CoprModuleBuilder.py +++ b/module_build_service/builder/CoprModuleBuilder.py @@ -163,11 +163,7 @@ class CoprModuleBuilder(GenericBuilder): # We are using same hack as mock builder does for artifact in artifacts: if artifact and artifact.startswith("module-build-macros"): - chroot = self.client.get_chroot(self.copr.projectname, self.copr.username, "fedora-24-x86_64") - packages = (chroot.data["chroot"]["buildroot_pkgs"] or "").split() - self.client.edit_chroot(self.copr.projectname, "fedora-24-x86_64", - ownername=self.copr.username, - packages=" ".join(set(["module-build-macros"] + packages))) + self._update_chroot(packages=["module-build-macros"]) break # Start of a new batch of builds is triggered by buildsys.repo.done message. @@ -181,6 +177,13 @@ class CoprModuleBuilder(GenericBuilder): repos = [self._dependency_repo(d, "x86_64") for d in dependencies] self.client.modify_project(self.copr.projectname, username=self.copr.username, repos=repos) + def _update_chroot(self, packages=None): + chroot = self.client.get_chroot(self.copr.projectname, self.copr.username, "fedora-24-x86_64") + current_packages = (chroot.data["chroot"]["buildroot_pkgs"] or "").split() + self.client.edit_chroot(self.copr.projectname, "fedora-24-x86_64", + ownername=self.copr.username, + packages=" ".join(set(packages + current_packages))) + def _dependency_repo(self, module, arch, backend="copr"): try: repo = GenericBuilder.tag_to_repo(backend, self.config, module, arch)