zuul/zuul-sphinx
Code Issues Proposed changes

Merge "Improve warning details"

Browse Source
This commit is contained in:
Zuul 2018-09-04 22:46:56 +00:00 committed by Gerrit Code Review
commit 6106a9051f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zuul_sphinx/zuul.py
View File

@ -491,15 +491,17 @@ class ZuulAutoJobsDirective(ZuulDirective):
has_content = False has_content = False
def run(self): def run(self):
lines = [] env = self.state.document.settings.env
names = set() names = set()
for job in self.zuul_layout.jobs: for job in self.zuul_layout.jobs:
name = job['name'] name = job['name']
if name in names: if name in names:
continue continue
lines.extend(self.generate_zuul_job_content(name)) lines = self.generate_zuul_job_content(name)
location = 'Job "%s" included in %s' % \
(name, env.doc2path(env.docname))
self.state_machine.insert_input(lines, location)
names.add(name) names.add(name)
self.state_machine.insert_input(lines, self.zuul_layout_path)
return [] return []
class ZuulAutoProjectTemplateDirective(ZuulDirective): class ZuulAutoProjectTemplateDirective(ZuulDirective):
@ -514,15 +516,17 @@ class ZuulAutoProjectTemplatesDirective(ZuulDirective):
has_content = False has_content = False
def run(self): def run(self):
lines = [] env = self.state.document.settings.env
names = set() names = set()
for template in self.zuul_layout.project_templates: for template in self.zuul_layout.project_templates:
name = template.name name = template.name
if name in names: if name in names:
continue continue
lines.extend(self.generate_zuul_project_template_content(name)) lines = self.generate_zuul_project_template_content(name)
location = 'Template "%s" included in %s' % \
(name, env.doc2path(env.docname))
self.state_machine.insert_input(lines, location)
names.add(name) names.add(name)
self.state_machine.insert_input(lines, self.zuul_layout_path)
return [] return []