diff options
author | Scott Moser <smoser@ubuntu.com> | 2015-07-27 20:55:48 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2015-07-27 20:55:48 -0400 |
commit | 6aa70d2f318a56343a7e42075a2249d40f401041 (patch) | |
tree | 00db6af8e6fd11c3635ed858705f9c77ff3bf190 | |
parent | 39f25660714e5640be3dce576a6cfdee9a1672c8 (diff) | |
parent | 3a59cf0077f01b82a8b464568bcdd94ce2112b1d (diff) | |
download | vyos-cloud-init-6aa70d2f318a56343a7e42075a2249d40f401041.tar.gz vyos-cloud-init-6aa70d2f318a56343a7e42075a2249d40f401041.zip |
fix build with merge from trunk
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | cloudinit/util.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -56,6 +56,7 @@ - distro mirrors: provide datasource to mirror selection code to support GCE regional mirrors. (LP: #1470890) - add udev rules that identify ephemeral device on Azure (LP: #1411582) + - _read_dmi_syspath: fix bad log message causing unintended exception 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/cloudinit/util.py b/cloudinit/util.py index db4e02b8..02ba654a 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2145,7 +2145,7 @@ def _read_dmi_syspath(key): return key_data.strip() except Exception as e: - logexc(LOG, "failed read of %s", dmi_key_path, e) + logexc(LOG, "failed read of %s", dmi_key_path) return None |