summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2017-04-06 16:58:16 -0700
committerGitHub <noreply@github.com>2017-04-06 16:58:16 -0700
commit48eeab8a5374ac9a84d337f892b2bb85089cf83b (patch)
tree0537ef3a703d22231d2ba1ba77fd6faf93bed93e /contrib
parent9e1bf1c6f2a8b60cd16fcecafdc259d962fdd264 (diff)
downloadansible-48eeab8a5374ac9a84d337f892b2bb85089cf83b.tar.gz
Fix errors reported by pylint. (#23282)
* Fix pylint misplaced-bare-raise errors. * Fix pylint return-in-init error. * Fix pylint bad-format-character error. * Fix pylint too-many-format-args errors. * Fix pylint too-few-format-args errors. * Fix pylint truncated-format-string error.
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/inventory/docker.py2
-rwxr-xr-xcontrib/inventory/linode.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/inventory/docker.py b/contrib/inventory/docker.py
index cc7b61e6d2..da051dd411 100755
--- a/contrib/inventory/docker.py
+++ b/contrib/inventory/docker.py
@@ -525,7 +525,7 @@ class AnsibleDockerClient(Client):
msg = "You asked for verification that Docker host name matches %s. The actual hostname is %s. " \
"Most likely you need to set DOCKER_TLS_HOSTNAME or pass tls_hostname with a value of %s. " \
"You may also use TLS without verification by setting the tls parameter to true." \
- % (self.auth_params['tls_hostname'], match.group(1))
+ % (self.auth_params['tls_hostname'], match.group(1), match.group(1))
self.fail(msg)
self.fail("SSL Exception: %s" % (error))
diff --git a/contrib/inventory/linode.py b/contrib/inventory/linode.py
index 1f54ba605b..6fd922fa6a 100755
--- a/contrib/inventory/linode.py
+++ b/contrib/inventory/linode.py
@@ -197,7 +197,7 @@ class LinodeInventory(object):
try:
return Linode.find(api_id=linode_id)
except chube_api.linode_api.ApiError as e:
- sys.exit("Looks like Linode's API is down:\n%" % e)
+ sys.exit("Looks like Linode's API is down:\n%s" % e)
def populate_datacenter_cache(self):
"""Creates self._datacenter_cache, containing all Datacenters indexed by ID."""