summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2016-10-15 10:52:56 -0400
committerPaul Belanger <pabelanger@redhat.com>2016-10-15 10:55:03 -0400
commita466b66cb700842d17538ab1b0bbb920bc307c46 (patch)
treeec97b9a9c229f24f41a042467ff82e7bb622d529
parentade8491e17784d89b0f026f6b48db98ddd4b107f (diff)
downloadzuul-a466b66cb700842d17538ab1b0bbb920bc307c46.tar.gz
Fix confusing debug message in configloader.py
Log debug message for applying template after we match, not before. To avoid the impression we are applying configuration to pipelines that templates are not apart of. Change-Id: I77d93a9c46f536d0258d3cb1d0a9fd92eb272d17 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
-rw-r--r--zuul/configloader.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/zuul/configloader.py b/zuul/configloader.py
index b41dcc17a..3f723fb05 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -255,9 +255,10 @@ class ProjectParser(object):
# create the jobs in the final definition as needed.
pipeline_defined = False
for template in configs:
- ProjectParser.log.debug("Applying template %s to pipeline %s" %
- (template.name, pipeline.name))
if pipeline.name in template.pipelines:
+ ProjectParser.log.debug(
+ "Applying template %s to pipeline %s" %
+ (template.name, pipeline.name))
pipeline_defined = True
template_pipeline = template.pipelines[pipeline.name]
project_pipeline.job_tree.inheritFrom(