diff --git a/mbs-koji-find-untagged.patch b/mbs-koji-find-untagged.patch index 46f3c09..496b23a 100644 --- a/mbs-koji-find-untagged.patch +++ b/mbs-koji-find-untagged.patch @@ -1,5 +1,5 @@ diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py -index eede0ab..88760ad 100644 +index eede0ab..9565237 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -67,6 +67,7 @@ class KojiModuleBuilder(GenericBuilder): @@ -51,6 +51,15 @@ index eede0ab..88760ad 100644 return None def build(self, artifact_name, source): +@@ -436,7 +451,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules + raise RuntimeError("Buildroot is not prep-ed") + + # Skip existing builds +- task_info = self._get_task_by_artifact(artifact_name) ++ task_info = self._get_build_by_artifact(artifact_name) + if task_info: + log.info("skipping build of %s. Build already exists (task_id=%s), via %s" % ( + source, task_info['task_id'], self)) diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 849bc07..7580d94 100644 --- a/module_build_service/scheduler/handlers/modules.py diff --git a/module-build-service.spec b/module-build-service.spec index a2fddb9..7816482 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.23 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Module Build Service for Modularity @@ -179,6 +179,9 @@ done %changelog +* Mon Jun 05 2017 Jan Kaluza - 1.3.23-3 +- correct the patch from previous commit + * Mon Jun 05 2017 Jan Kaluza - 1.3.23-2 - fix bug when untagged builds couldn't be find in Koji