From e1a9034e0f5fc8527c6363ed1ee7ba8e704a0588 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 3 Mar 2017 06:47:30 -0500 Subject: [PATCH 1/3] Fix another attribute error. --- module_build_service/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index 17e93b3d..292e1534 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -887,7 +887,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules task_opts['mbs_module_name'] = None for c in component_builds: if (c.package == task_opts['mbs_artifact_name'] and - c.tag == task_opts['mbs_module_name']): + c.module_build.koji_tag == task_opts['mbs_module_name']): tasks.append(task) return tasks From 467c2bb36a7363a7ea8641eaa32ed8e06758ebf8 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Fri, 3 Mar 2017 14:09:01 +0100 Subject: [PATCH 2/3] rename "mbs_module_name" to "mbs_module_target" --- module_build_service/builder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index 292e1534..aa50d978 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -649,7 +649,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules build_opts = {"skip_tag": True, "mbs_artifact_name": artifact_name, - "mbs_module_name": module_target} + "mbs_module_target": module_target} task_id = self.koji_session.build(source, module_target, build_opts, priority=self.build_priority) @@ -883,11 +883,11 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules continue if 'mbs_artifact_name' not in task_opts: task_opts['mbs_artifact_name'] = None - if 'mbs_module_name' not in task_opts: - task_opts['mbs_module_name'] = None + if 'mbs_module_target' not in task_opts: + task_opts['mbs_module_target'] = None for c in component_builds: if (c.package == task_opts['mbs_artifact_name'] and - c.module_build.koji_tag == task_opts['mbs_module_name']): + c.module_build.koji_tag == task_opts['mbs_module_target']): tasks.append(task) return tasks From 1ece0e0a8aedd3af0ff1e418a0670c0cdef94a99 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Fri, 3 Mar 2017 15:19:42 +0100 Subject: [PATCH 3/3] reference to #397 --- module_build_service/builder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index aa50d978..e9e74b28 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -886,6 +886,8 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules if 'mbs_module_target' not in task_opts: task_opts['mbs_module_target'] = None for c in component_builds: + # TODO: https://pagure.io/fm-orchestrator/issue/397 + # Subj: Do not mix target/tag when looking for component builds if (c.package == task_opts['mbs_artifact_name'] and c.module_build.koji_tag == task_opts['mbs_module_target']): tasks.append(task)