jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "cmd.py: tweak plugin information querying logic"

Browse Source
This commit is contained in:
Jenkins 2015-11-03 12:46:08 +00:00 committed by Gerrit Code Review
commit 4408bca1ed
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/execution.rst
View File

@ -76,10 +76,10 @@ jenkins section
By default this is set to the system configured socket timeout. By default this is set to the system configured socket timeout.
**query_plugins_info** **query_plugins_info**
Whether to query the Jenkins instance for plugin info when a configuration Whether to query the Jenkins instance for plugin info. If no configuration
file is provided. If a configuration file is not provided `jenkins-jobs` will files are found (either in the default paths or given through the
ignore this setting and skip querying for plugin information. True by command-line), `jenkins-jobs` will skip querying for plugin information. True
default. by default.
hipchat section hipchat section

1
jenkins_jobs/cmd.py
View File

@ -187,6 +187,7 @@ def setup_config_settings(options):
# Load default config always # Load default config always
config.readfp(StringIO(DEFAULT_CONF)) config.readfp(StringIO(DEFAULT_CONF))
if os.path.isfile(conf): if os.path.isfile(conf):
options.conf = conf # remember file we read from
logger.debug("Reading config from {0}".format(conf)) logger.debug("Reading config from {0}".format(conf))
conffp = io.open(conf, 'r', encoding='utf-8') conffp = io.open(conf, 'r', encoding='utf-8')
config.readfp(conffp) config.readfp(conffp)