summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-06-15 22:50:12 -0400
committerScott Moser <smoser@ubuntu.com>2016-06-15 22:50:12 -0400
commitd4b587ebf500ddc2259fffc94a3c69c199c9a427 (patch)
tree987a743859aadb4bf2ad3daf0cc9e62afc92294c /cloudinit/distros
parent8311e8f7a2d4ad782015c0eb4d22efd0c5a8af0f (diff)
downloadvyos-cloud-init-d4b587ebf500ddc2259fffc94a3c69c199c9a427.tar.gz
vyos-cloud-init-d4b587ebf500ddc2259fffc94a3c69c199c9a427.zip
fix some errors reported by pylint
pylint --errors-only found several errors. Some of the changes here represent real errors, others just code that pylint did not like.
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/__init__.py2
-rw-r--r--cloudinit/distros/arch.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 5c29c804..14b500f8 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -454,7 +454,7 @@ class Distro(object):
keys = kwargs['ssh_authorized_keys']
if isinstance(keys, six.string_types):
keys = [keys]
- if isinstance(keys, dict):
+ elif isinstance(keys, dict):
keys = list(keys.values())
if keys is not None:
if not isinstance(keys, (tuple, list, set)):
diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py
index 93a2e008..66209f22 100644
--- a/cloudinit/distros/arch.py
+++ b/cloudinit/distros/arch.py
@@ -196,6 +196,6 @@ def convert_resolv_conf(settings):
"""Returns a settings string formatted for resolv.conf."""
result = ''
if isinstance(settings, list):
- for ns in list:
+ for ns in settings:
result = result + 'nameserver %s\n' % ns
- return result
+ return result