diff options
| author | Scott Moser <smoser@brickies.net> | 2016-10-25 17:06:18 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-10-25 17:06:18 -0400 |
| commit | f294110e5c8b121f8d8dcb48b0845a419ba13544 (patch) | |
| tree | 9f5adaa598f5e943310075aa3255169db14fad9f /cloudinit/sources/DataSourceAltCloud.py | |
| parent | 1a2086302c3a62277b272bd004e34eb5d264c2fe (diff) | |
| parent | 29348af1c889931e8973f8fc8cb090c063316f7a (diff) | |
| download | vyos-cloud-init-f294110e5c8b121f8d8dcb48b0845a419ba13544.tar.gz vyos-cloud-init-f294110e5c8b121f8d8dcb48b0845a419ba13544.zip | |
merge from master at 0.7.8-27-g29348af
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), |