jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Fail if specified set of defaults is not found."

Browse Source
This commit is contained in:
Jenkins 2014-05-28 01:49:57 +00:00 committed by Gerrit Code Review
commit 24ce90ea84
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins_jobs/builder.py
View File

@ -170,6 +170,9 @@ class YamlParser(object):
def applyDefaults(self, data): def applyDefaults(self, data):
whichdefaults = data.get('defaults', 'global') whichdefaults = data.get('defaults', 'global')
defaults = self.data.get('defaults', {}).get(whichdefaults, {}) defaults = self.data.get('defaults', {}).get(whichdefaults, {})
if defaults == {} and whichdefaults != 'global':
raise JenkinsJobsException("Unknown defaults set: '{0}'"
.format(whichdefaults))
newdata = {} newdata = {}
newdata.update(defaults) newdata.update(defaults)
newdata.update(data) newdata.update(data)