From f2f766015a0e875605a24703c5f0e18751650fe8 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 30 Jul 2015 22:06:31 -0400 Subject: status_wrapper in main: fix use of print_exc when handling exception --- ChangeLog | 1 + bin/cloud-init | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8a1c77bc..d885b9f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ - add udev rules that identify ephemeral device on Azure (LP: #1411582) - _read_dmi_syspath: fix bad log message causing unintended exception - rsyslog: add additional configuration mode (LP: #1478103) + - status_wrapper in main: fix use of print_exc when handling exception 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/bin/cloud-init b/bin/cloud-init index 1d3e7ee3..d50ac694 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -506,7 +506,7 @@ def status_wrapper(name, args, data_d=None, link_d=None): except Exception as e: util.logexc(LOG, "failed of stage %s", mode) - print_exc("failed run of stage %s", mode) + print_exc("failed run of stage %s" mode) v1[mode]['errors'] = [str(e)] v1[mode]['finished'] = time.time() -- cgit v1.2.3 From 0d85766423073c7af17750e9faaafdd33c63ae08 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 31 Jul 2015 11:20:36 -0400 Subject: status_wrapper in main: correct fix use of print_exc when handling exception --- bin/cloud-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cloud-init b/bin/cloud-init index d50ac694..63c13b09 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -506,7 +506,7 @@ def status_wrapper(name, args, data_d=None, link_d=None): except Exception as e: util.logexc(LOG, "failed of stage %s", mode) - print_exc("failed run of stage %s" mode) + print_exc("failed run of stage %s" % mode) v1[mode]['errors'] = [str(e)] v1[mode]['finished'] = time.time() -- cgit v1.2.3