opendev/puppet-jenkins
Code Issues Proposed changes

Fix name off-by-one

Browse Source 
Job names were off-by-one

Change-Id: I0f3a9936b543189ca073e4559084f400eeae2a1a
This commit is contained in:
Andrew Hutchings 2012-05-27 16:34:01 +01:00
parent c30656b74d
commit 7b13362dc9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/jenkins_jobs/files/jenkins_jobs.py
View File

@ -53,6 +53,7 @@ class YamlParser(object):
def __init__(self, yfile): def __init__(self, yfile):
self.data = yaml.load_all(yfile) self.data = yaml.load_all(yfile)
self.it = self.data.__iter__() self.it = self.data.__iter__()
self.job_name = None
self.template_data = None self.template_data = None
self.current = None self.current = None
self.current_template = None self.current_template = None
@ -79,8 +80,10 @@ class YamlParser(object):
if not self.eof: if not self.eof:
if self.reading_template: if self.reading_template:
data = XmlParser(self.current_template) data = XmlParser(self.current_template)
self.job_name = self.current_template['main']['name']
else: else:
data = XmlParser(self.current) data = XmlParser(self.current)
self.job_name = self.current['main']['name']
self.seek_next_xml() self.seek_next_xml()
return data return data
else: else:
@ -103,11 +106,7 @@ class YamlParser(object):
self.current_template = self.template_it.next() self.current_template = self.template_it.next()
def get_name(self): def get_name(self):
if self.reading_template: return self.job_name
return self.current_template['main']['name']
else:
return self.current['main']['name']
class XmlParser(object): class XmlParser(object):
def __init__(self, data): def __init__(self, data):