diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-04 13:46:09 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-04 13:46:09 -0400 |
| commit | b380e16183446f2e39f47a3c0804d2081714acb2 (patch) | |
| tree | a5e05b4a22553769d6eaa7e5fa93e3401a758b2b /cloudinit/sources/DataSourceAltCloud.py | |
| parent | 882b22e024733e17757fdbe36ba2a3672c6ebe06 (diff) | |
| parent | a1cdebdea65ccd827060c823146992bba9debe19 (diff) | |
| download | vyos-cloud-init-b380e16183446f2e39f47a3c0804d2081714acb2.tar.gz vyos-cloud-init-b380e16183446f2e39f47a3c0804d2081714acb2.zip | |
merge from master at 0.7.8-34-ga1cdebd
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), |