jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Remove unnecessary warning message."

Browse Source
This commit is contained in:
Jenkins 2015-03-02 19:17:53 +00:00 committed by Gerrit Code Review
commit 9cbba31054
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jenkins_jobs/modules/scm.py
View File

@ -253,19 +253,17 @@ remoteName/\*')
for elem in mapping:
(optname, xmlname, val) = elem[:3]
# Throw warning for deprecated settings and skip
# Throw warning for deprecated settings and skip if the 'submodule' key
# is available.
submodule_cfgs = ['disable-submodules', 'recursive-submodules']
if optname in submodule_cfgs:
if 'submodule' in data:
logger.warn("'{0}' is deprecated and will be ignored in "
"favour of 'submodule'".format(optname))
continue
if optname in data:
logger.warn("'{0}' is deprecated, please convert to use the "
"'submodule' section instead as support for this "
"top level option will be removed in a future "
"release.".format(optname))
if 'submodule' in data:
continue
attrs = {}
if len(elem) >= 4: