diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-30 15:53:42 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-10-19 20:02:56 -0400 |
| commit | e8730078df8c99696b1b684e09c803eef7c4926c (patch) | |
| tree | bd2d04720201ccc78df8a1afe531084913e1b059 /cloudinit/sources/DataSourceAltCloud.py | |
| parent | f0747c4b4cf073273e11d383f0354257be7276ed (diff) | |
| download | vyos-cloud-init-e8730078df8c99696b1b684e09c803eef7c4926c.tar.gz vyos-cloud-init-e8730078df8c99696b1b684e09c803eef7c4926c.zip | |
Fix python2.6 things found running in centos 6.
This gets the tests running in centos 6.
* ProcessExecutionError: remove setting of .message
Nothing in cloud-init seems to use .message anywhere, so
it does not seem necessary.
The reason to change it is that on 2.6 it spits out:
cloudinit/util.py:286: DeprecationWarning: BaseException.message
* tox.ini: add a centos6 environment
the tox versions listed here replicate a centos6 install with
packages from EPEL.
You will still need a python2.6 to run this env so we do not
enable it by default.
Diffstat (limited to 'cloudinit/sources/DataSourceAltCloud.py')
| -rw-r--r-- | cloudinit/sources/DataSourceAltCloud.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py index 48136f7c..20345389 100644 --- a/cloudinit/sources/DataSourceAltCloud.py +++ b/cloudinit/sources/DataSourceAltCloud.py @@ -195,8 +195,7 @@ class DataSourceAltCloud(sources.DataSource): (cmd_out, _err) = util.subp(cmd) LOG.debug(('Command: %s\nOutput%s') % (' '.join(cmd), cmd_out)) except ProcessExecutionError 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 except OSError as _err: util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd), _err) @@ -211,8 +210,7 @@ class DataSourceAltCloud(sources.DataSource): (cmd_out, _err) = util.subp(cmd) LOG.debug(('Command: %s\nOutput%s') % (' '.join(cmd), cmd_out)) except ProcessExecutionError 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 except OSError as _err: util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd), |