From 7b13362dc95e5cddf8696f5b49cfd7e76e0d7ed9 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Sun, 27 May 2012 16:34:01 +0100 Subject: [PATCH] Fix name off-by-one Job names were off-by-one Change-Id: I0f3a9936b543189ca073e4559084f400eeae2a1a --- modules/jenkins_jobs/files/jenkins_jobs.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/jenkins_jobs/files/jenkins_jobs.py b/modules/jenkins_jobs/files/jenkins_jobs.py index be10aa8..43068f7 100644 --- a/modules/jenkins_jobs/files/jenkins_jobs.py +++ b/modules/jenkins_jobs/files/jenkins_jobs.py @@ -53,6 +53,7 @@ class YamlParser(object): def __init__(self, yfile): self.data = yaml.load_all(yfile) self.it = self.data.__iter__() + self.job_name = None self.template_data = None self.current = None self.current_template = None @@ -79,8 +80,10 @@ class YamlParser(object): if not self.eof: if self.reading_template: data = XmlParser(self.current_template) + self.job_name = self.current_template['main']['name'] else: data = XmlParser(self.current) + self.job_name = self.current['main']['name'] self.seek_next_xml() return data else: @@ -103,11 +106,7 @@ class YamlParser(object): self.current_template = self.template_it.next() def get_name(self): - if self.reading_template: - return self.current_template['main']['name'] - else: - return self.current['main']['name'] - + return self.job_name class XmlParser(object): def __init__(self, data):