diff options
author | Scott Moser <smoser@ubuntu.com> | 2016-06-20 22:38:26 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2016-06-20 22:38:26 -0400 |
commit | 30178e219cce007505d42b49ceb7499364b435de (patch) | |
tree | 1ec50e5f8c07ab1c7b4e206a5d0c7dca0858b640 /cloudinit/sources/DataSourceAltCloud.py | |
parent | c706c3a4df9b538864738b804013fb36571efa49 (diff) | |
parent | e56a88a9a52985e5bb45394d150340c1a452f7ac (diff) | |
download | cloud-init-30178e219cce007505d42b49ceb7499364b435de.tar.gz |
merge with trunk.
test runs to the point where it did, think I got most of the changes
incorporated.
Diffstat (limited to 'cloudinit/sources/DataSourceAltCloud.py')
-rw-r--r-- | cloudinit/sources/DataSourceAltCloud.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py index cd61df31..a3529609 100644 --- a/cloudinit/sources/DataSourceAltCloud.py +++ b/cloudinit/sources/DataSourceAltCloud.py @@ -205,8 +205,7 @@ class DataSourceAltCloud(sources.DataSource): _err.message) 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 floppy_dev = '/dev/fd0' |