jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Remove superfluous calls to matches()"

This commit is contained in:
Jenkins 2015-04-23 17:07:10 +00:00 committed by Gerrit Code Review
parent 2a8b57aa40 c29066210c
commit 38ef922a2b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins_jobs/builder.py
View File

@ -823,10 +823,8 @@ class Builder(object):
def delete_job(self, jobs_glob, fn=None):
if fn:
self.load_files(fn)
self.parser.expandYaml(jobs_glob)
jobs = [j['name']
for j in self.parser.jobs
if matches(j['name'], [jobs_glob])]
self.parser.expandYaml([jobs_glob])
jobs = [j['name'] for j in self.parser.jobs]
else:
jobs = [jobs_glob]
@ -862,8 +860,6 @@ class Builder(object):
updated_jobs = 0
for job in self.parser.xml_jobs:
if jobs_glob and not matches(job.name, jobs_glob):
continue
if output:
if hasattr(output, 'write'):
# `output` is a file-like object