summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2019-01-30 11:40:50 -0500
committerDaniel Watkins <daniel.watkins@canonical.com>2019-01-30 11:40:50 -0500
commitc59b5a5258c875d814b1ada82fd7bbaf7de97a26 (patch)
tree0cf943771a3bd1106eb6fcbec42666c151ca3e00
parent51e2a99d5828488aee0ac809c491bf8b1c1321e7 (diff)
Fix new flake8 failures
Notes
Notes (review): Code-Review+2: Sorin Sbarnea <ssbarnea@redhat.com> Workflow+1: Sorin Sbarnea <ssbarnea@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 30 Jan 2019 17:07:10 +0000 Reviewed-on: https://review.openstack.org/634009 Project: openstack-infra/jenkins-job-builder Branch: refs/heads/master
-rw-r--r--jenkins_jobs/config.py6
-rw-r--r--jenkins_jobs/modules/publishers.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/jenkins_jobs/config.py b/jenkins_jobs/config.py
index 031bb92..9a65010 100644
--- a/jenkins_jobs/config.py
+++ b/jenkins_jobs/config.py
@@ -265,9 +265,9 @@ class JJBConfig(object):
265 265
266 plugins_info = None 266 plugins_info = None
267 if (config.has_option(self._section, 'query_plugins_info') and 267 if (config.has_option(self._section, 'query_plugins_info') and
268 not config.getboolean(self._section, "query_plugins_info")): 268 not config.getboolean(self._section, "query_plugins_info")):
269 logger.debug("Skipping plugin info retrieval") 269 logger.debug("Skipping plugin info retrieval")
270 plugins_info = [] 270 plugins_info = []
271 self.builder['plugins_info'] = plugins_info 271 self.builder['plugins_info'] = plugins_info
272 272
273 self.recursive = config.getboolean('job_builder', 'recursive') 273 self.recursive = config.getboolean('job_builder', 'recursive')
diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index 126077c..38cf575 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
@@ -6265,7 +6265,7 @@ def conditional_publisher(registry, xml_parent, data):
6265 # Check the length of actions list for versions prior to 0.13. 6265 # Check the length of actions list for versions prior to 0.13.
6266 # Flexible Publish will overwrite action if more than one is 6266 # Flexible Publish will overwrite action if more than one is
6267 # specified. Limit the action list to one element. 6267 # specified. Limit the action list to one element.
6268 if len(actions) is not 1: 6268 if len(actions) != 1:
6269 raise JenkinsJobsException("Only one action may be " 6269 raise JenkinsJobsException("Only one action may be "
6270 "specified for each condition.") 6270 "specified for each condition.")
6271 for action in actions: 6271 for action in actions: