diff options
| author | Joshua Powers <josh.powers@canonical.com> | 2017-03-21 14:18:46 -0600 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-03-24 15:11:53 -0400 |
| commit | 35cf3415f9748c880db4d3c004f3410c3aa2cab2 (patch) | |
| tree | 0f4985af251431543e4b10aef15cf443cdc5f38a /cloudinit/sources | |
| parent | 2e879da890a4287dd52eab17938d227da7af253a (diff) | |
| download | vyos-cloud-init-35cf3415f9748c880db4d3c004f3410c3aa2cab2.tar.gz vyos-cloud-init-35cf3415f9748c880db4d3c004f3410c3aa2cab2.zip | |
test: add running of pylint
Now tox will run pylint. The .pylintrc file sets pylint to only produce
errors, and will ignore certain classes that are known problematic (six).
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceAltCloud.py | 3 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 4 | ||||
| -rw-r--r-- | cloudinit/sources/__init__.py | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py index c2b0eac2..8528fa10 100644 --- a/cloudinit/sources/DataSourceAltCloud.py +++ b/cloudinit/sources/DataSourceAltCloud.py @@ -201,8 +201,7 @@ class DataSourceAltCloud(sources.DataSource): util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd), _err) return False except OSError as _err: - util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd), - _err.message) + util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd), _err) return False try: diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py index 1f1baf46..cd75e6ea 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -286,12 +286,12 @@ def parse_shell_config(content, keylist=None, bash=None, asuser=None, output = output[0:-1] # remove trailing null # go through output. First _start_ is for 'preset', second for 'target'. - # Add to target only things were changed and not in volitile + # Add to ret only things were changed and not in excluded. for line in output.split("\x00"): try: (key, val) = line.split("=", 1) if target is preset: - target[key] = val + preset[key] = val elif (key not in excluded and (key in keylist_in or preset.get(key) != val)): ret[key] = val diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index 18294505..5c99437e 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -50,7 +50,7 @@ class DataSource(object): self.distro = distro self.paths = paths self.userdata = None - self.metadata = None + self.metadata = {} self.userdata_raw = None self.vendordata = None self.vendordata_raw = None |